Hi Linus, Hopefully you get your power back at some point, this is just a wrap up of fixes from the last few days. It has the proper fix to the i915/xe collision, we can clean up what you did later once rc1 lands. Otherwise it's a few other i915, a v3d, rockchip and a nouveau fix to make GSP load on some original Turing GPUs. I have some amdgpu fixes lined up, but they broke clang build here, so I'll wait to send those until AMD can fix it. Dave. drm-next-2024-01-15-1: drm fixes for 6.8-rc1 i915: - Fixes for kernel-doc warnings enforced in linux-next - Another build warning fix for string formatting of intel_wakeref_t - Display fixes for DP DSC BPC and C20 PLL state verification v3d: - register readout fix rockchip: - two build warning fixes nouveau: - fix GSP loading on Turing with different nvdec configuration The following changes since commit b76c01f1d950425924ee1c1377760de3c024ef78: Merge tag 'drm-intel-gt-next-2023-12-15' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2024-01-10 11:36:47 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-next-2024-01-15-1 for you to fetch changes up to 205e18c13545ab43cc4fe4930732b4feef551198: nouveau/gsp: handle engines in runl without nonstall interrupts. (2024-01-15 16:04:48 +1000) ---------------------------------------------------------------- drm fixes for 6.8-rc1 i915: - Fixes for kernel-doc warnings enforced in linux-next - Another build warning fix for string formatting of intel_wakeref_t - Display fixes for DP DSC BPC and C20 PLL state verification v3d: - register readout fix rockchip: - two build warning fixes nouveau: - fix GSP loading on Turing with different nvdec configuration ---------------------------------------------------------------- Ankit Nautiyal (1): drm/i915/dp: Fix the max DSC bpc supported by source Cristian Ciocaltea (2): drm/rockchip: vop2: Drop superfluous include drm/rockchip: vop2: Drop unused if_dclk_rate variable Dave Airlie (3): Merge tag 'drm-intel-next-fixes-2024-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-next Merge tag 'drm-misc-next-fixes-2024-01-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-next nouveau/gsp: handle engines in runl without nonstall interrupts. Imre Deak (1): drm/i915/dp: Fix the PSR debugfs entries wrt. MST connectors Jani Nikula (1): drm/i915: don't make assumptions about intel_wakeref_t type Maíra Canal (1): drm/v3d: Fix support for register debugging on the RPi 4 Mika Kahola (1): drm/i915/display: Fix C20 pll selection for state verification Randy Dunlap (4): drm/i915/gem: reconcile Excess struct member kernel-doc warnings drm/i915/gt: reconcile Excess struct member kernel-doc warnings drm/i915/guc: reconcile Excess struct member kernel-doc warnings drm/i915/perf: reconcile Excess struct member kernel-doc warnings drivers/gpu/drm/i915/display/intel_cx0_phy.c | 25 +++++--- drivers/gpu/drm/i915/display/intel_display_power.c | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- drivers/gpu/drm/i915/display/intel_psr.c | 10 +-- drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 4 +- drivers/gpu/drm/i915/gt/intel_gsc.h | 7 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 75 ++++++++++++---------- drivers/gpu/drm/i915/i915_perf_types.h | 9 ++- drivers/gpu/drm/nouveau/nvkm/engine/fifo/ga100.c | 4 ++ drivers/gpu/drm/nouveau/nvkm/engine/fifo/r535.c | 2 +- drivers/gpu/drm/nouveau/nvkm/subdev/gsp/base.c | 8 +-- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 4 +- drivers/gpu/drm/v3d/v3d_debugfs.c | 20 +++--- 13 files changed, 96 insertions(+), 78 deletions(-)