Commit 3ef7acec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2025-02-22' of https://gitlab.freedesktop.org/drm/kernel 

Pull drm fixes from Dave Airlie:
 "Weekly drm fixes pull request, lots of small things all over, msm has
  a bunch of things but all very small, xe, i915, a fix for the cgroup
  dmem controller.

  core:
   - remove MAINTAINERS entry

  cgroup/dmem:
   - use correct function for pool descendants

  panel:
   - fix signal polarity issue jd9365da-h3

  nouveau:
   - folio handling fix
   - config fix

  amdxdna:
   - fix missing header

  xe:
   - Fix error handling in xe_irq_install
   - Fix devcoredump format

  i915:
   - Use spin_lock_irqsave() in interruptible context on guc submission
   - Fixes on DDI and TRANS programming
   - Make sure all planes in use by the joiner have their crtc included
   - Fix 128b/132b modeset issues

  msm:
   - More catalog fixes:
      - to skip watchdog programming through top block if its not
        present
      - fix the setting of WB mask to ensure the WB input control is
        programmed correctly through ping-pong
      - drop lm_pair for sm6150 as that chipset does not have any
        3dmerge block
      - Fix the mode validation logic for DP/eDP to account for widebus
        (2ppc) to allow high clock resolutions
      - Fix to disable dither during encoder disable as otherwise this
        was causing kms_writeback failure due to resource sharing
        between WB and DSI paths as DSI uses dither but WB does not
      - Fixes for virtual planes, namely to drop extraneous return and
        fix uninitialized variables
      - Fix to avoid spill-over of DSC encoder block bits when
        programming the bits-per-component
      - Fixes in the DSI PHY to protect against concurrent access of
        PHY_CMN_CLK_CFG regs between clock and display drivers
   - Core/GPU:
      - Fix non-blocking fence wait incorrectly rounding up to 1 jiffy
        timeout
      - Only print GMU fw version once, instead of each time the GPU
        resumes"

* tag 'drm-fixes-2025-02-22' of https://gitlab.freedesktop.org/drm/kernel: (28 commits)
  drm/i915/dp: Fix disabling the transcoder function in 128b/132b mode
  drm/i915/dp: Fix error handling during 128b/132b link training
  accel/amdxdna: Add missing include linux/slab.h
  MAINTAINERS: Remove myself
  drm/nouveau/pmu: Fix gp10b firmware guard
  cgroup/dmem: Don't open-code css_for_each_descendant_pre
  drm/xe/guc: Fix size_t print format
  drm/xe: Make GUC binaries dump consistent with other binaries in devcoredump
  drm/i915: Make sure all planes in use by the joiner have their crtc included
  drm/i915/ddi: Fix HDMI port width programming in DDI_BUF_CTL
  drm/i915/dsi: Use TRANS_DDI_FUNC_CTL's own port width macro
  drm/xe: Fix error handling in xe_irq_install()
  drm/i915/gt: Use spin_lock_irqsave() in interruptible context
  drm/msm/dsi/phy: Do not overwite PHY_CMN_CLK_CFG1 when choosing bitclk source
  drm/msm/dsi/phy: Protect PHY_CMN_CLK_CFG1 against clock driver
  drm/msm/dsi/phy: Protect PHY_CMN_CLK_CFG0 updated from driver side
  drm/msm/dpu: Drop extraneous return in dpu_crtc_reassign_planes()
  drm/msm/dpu: Don't leak bits_per_component into random DSC_ENC fields
  drm/msm/dpu: Disable dither in phys encoder cleanup
  drm/msm/dpu: Fix uninitialized variable
  ...
parents 8a61cb6e 9a1cd7d6

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -7425,7 +7425,6 @@ F: Documentation/devicetree/bindings/display/panel/novatek,nt36672a.yaml 
F:	drivers/gpu/drm/panel/panel-novatek-nt36672a.c









DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS









M:	Karol Herbst <kherbst@redhat.com>









M:	Lyude Paul <lyude@redhat.com>









M:	Danilo Krummrich <dakr@kernel.org>









L:	dri-devel@lists.freedesktop.org








@@ -24069,7 +24068,6 @@ F:	tools/testing/selftests/ftrace/







TRACING MMIO ACCESSES (MMIOTRACE)









M:	Steven Rostedt <rostedt@goodmis.org>









M:	Masami Hiramatsu <mhiramat@kernel.org>









R:	Karol Herbst <karolherbst@gmail.com>









R:	Pekka Paalanen <ppaalanen@gmail.com>









L:	linux-kernel@vger.kernel.org









L:	nouveau@lists.freedesktop.org

























drivers/accel/amdxdna/amdxdna_mailbox.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -8,6 +8,7 @@







#include <linux/bitfield.h>









#include <linux/interrupt.h>









#include <linux/iopoll.h>









#include <linux/slab.h>









#include <linux/xarray.h>



















#define CREATE_TRACE_POINTS
































drivers/gpu/drm/i915/display/icl_dsi.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -809,8 +809,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder,







		/* select data lane width */









		tmp = intel_de_read(display,









				    TRANS_DDI_FUNC_CTL(display, dsi_trans));









		tmp &= ~DDI_PORT_WIDTH_MASK;









		tmp |= DDI_PORT_WIDTH(intel_dsi->lane_count);









		tmp &= ~TRANS_DDI_PORT_WIDTH_MASK;









		tmp |= TRANS_DDI_PORT_WIDTH(intel_dsi->lane_count);



















		/* select input pipe */









		tmp &= ~TRANS_DDI_EDP_INPUT_MASK;
































drivers/gpu/drm/i915/display/intel_ddi.c



+3
−5






























Original line number
Diff line number
Diff line







@@ -658,7 +658,6 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state







	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);









	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);









	enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;









	bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);









	u32 ctl;



















	if (DISPLAY_VER(dev_priv) >= 11)








@@ -678,8 +677,7 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state







			 TRANS_DDI_PORT_SYNC_MASTER_SELECT_MASK);



















	if (DISPLAY_VER(dev_priv) >= 12) {









		if (!intel_dp_mst_is_master_trans(crtc_state) ||









		    (!is_mst && intel_dp_is_uhbr(crtc_state))) {









		if (!intel_dp_mst_is_master_trans(crtc_state)) {









			ctl &= ~(TGL_TRANS_DDI_PORT_MASK |









				 TRANS_DDI_MODE_SELECT_MASK);









		}








@@ -3134,7 +3132,7 @@ static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,







	intel_dp_set_power(intel_dp, DP_SET_POWER_D3);



















	if (DISPLAY_VER(dev_priv) >= 12) {









		if (is_mst) {









		if (is_mst || intel_dp_is_uhbr(old_crtc_state)) {









			enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;



















			intel_de_rmw(dev_priv,








@@ -3487,7 +3485,7 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state,







		intel_de_rmw(dev_priv, XELPDP_PORT_BUF_CTL1(dev_priv, port),









			     XELPDP_PORT_WIDTH_MASK | XELPDP_PORT_REVERSAL, port_buf);



















		buf_ctl |= DDI_PORT_WIDTH(lane_count);









		buf_ctl |= DDI_PORT_WIDTH(crtc_state->lane_count);



















		if (DISPLAY_VER(dev_priv) >= 20)









			buf_ctl |= XE2LPD_DDI_BUF_D2D_LINK_ENABLE;
































drivers/gpu/drm/i915/display/intel_display.c



+18
−0






























Original line number
Diff line number
Diff line







@@ -6628,12 +6628,30 @@ static int intel_async_flip_check_hw(struct intel_atomic_state *state, struct in







static int intel_joiner_add_affected_crtcs(struct intel_atomic_state *state)









{









	struct drm_i915_private *i915 = to_i915(state->base.dev);









	const struct intel_plane_state *plane_state;









	struct intel_crtc_state *crtc_state;









	struct intel_plane *plane;









	struct intel_crtc *crtc;









	u8 affected_pipes = 0;









	u8 modeset_pipes = 0;









	int i;



















	/*









	 * Any plane which is in use by the joiner needs its crtc.









	 * Pull those in first as this will not have happened yet









	 * if the plane remains disabled according to uapi.









	 */









	for_each_new_intel_plane_in_state(state, plane, plane_state, i) {









		crtc = to_intel_crtc(plane_state->hw.crtc);









		if (!crtc)









			continue;



















		crtc_state = intel_atomic_get_crtc_state(&state->base, crtc);









		if (IS_ERR(crtc_state))









			return PTR_ERR(crtc_state);









	}



















	/* Now pull in all joined crtcs */









	for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {









		affected_pipes |= crtc_state->joiner_pipes;









		if (intel_crtc_needs_modeset(crtc_state))