From: Dave Airlie <airlied@redhat.com>
Date: Thu, 11 Apr 2024 19:37:15 +0000 (+1000)
Subject: Merge tag 'drm-xe-fixes-2024-04-11' of https://gitlab.freedesktop.org/drm/xe/kernel... 
X-Git-Tag: for-linus-6.9~95^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1bafeaf26264546b7592caa05611b22740ee6ccb;p=users%2Fdwmw2%2Flinux.git

Merge tag 'drm-xe-fixes-2024-04-11' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes

- Fix double display mutex initializations
- Fix u32 -> u64 implicit conversions
- Fix RING_CONTEXT_CONTROL not marked as masked

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ewvvtgcb2gonxvccws6nt6fqswoyfp4g43t5ex24vpqwtrxdzm@hgjoz5uirmxx
---

1bafeaf26264546b7592caa05611b22740ee6ccb