Commit b01f596a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-03-28' of... 

Merge tag 'drm-intel-fixes-2024-03-28' of https://anongit.freedesktop.org/git/drm/drm-intel

 into drm-fixes

Core/GT Fixes:
- Fix for BUG_ON/BUILD_BUG_ON IN I915_memcpy.c (Joonas)
- Update a MTL workaround (Tejas)
- Fix locking inversion in hwmon's sysfs (Janusz)
- Remove a bogus error message around PXP (Jose)
- Fix UAF on VMA (Janusz)
- Reset queue_priority_hint on parking (Chris)

Display Fixes:
- Remove duplicated audio enable/disable on SDVO and DP (Ville)
- Disable AuxCCS for Xe driver (Juha-Pekka)
- Revert init order of MIPI DSI (Ville)
- DRRS debugfs fix with an extra refactor patch (Bhanuprakash)
- VRR related fixes (Ville)
- Fix a JSL eDP corruption (Jonathon)
- Fix the cursor physical dma address (Ville)
- BIOS VBT related fix (Ville)

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

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZgYaIVgjIs30mIvS@intel.com
parents 2f73503e 32e39bab

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

+0 −2
Original line number Diff line number Diff line
@@ -717,7 +717,6 @@ static void g4x_enable_dp(struct intel_atomic_state *state, 
{

	intel_enable_dp(state, encoder, pipe_config, conn_state);

	intel_edp_backlight_on(pipe_config, conn_state);

	encoder->audio_enable(encoder, pipe_config, conn_state);

}



static void vlv_enable_dp(struct intel_atomic_state *state,
@@ -726,7 +725,6 @@ static void vlv_enable_dp(struct intel_atomic_state *state, 
			  const struct drm_connector_state *conn_state)

{

	intel_edp_backlight_on(pipe_config, conn_state);

	encoder->audio_enable(encoder, pipe_config, conn_state);

}



static void g4x_pre_enable_dp(struct intel_atomic_state *state,

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

+2 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,6 @@ static void gen11_dsi_powerup_panel(struct intel_encoder *encoder) 
	}



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_INIT_OTP);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);



	/* ensure all panel commands dispatched before enabling transcoder */

	wait_for_cmds_dispatched_to_panel(encoder);
@@ -1256,6 +1255,8 @@ static void gen11_dsi_enable(struct intel_atomic_state *state, 
	/* step6d: enable dsi transcoder */

	gen11_dsi_enable_transcoder(encoder);



	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_DISPLAY_ON);



	/* step7: enable backlight */

	intel_backlight_enable(crtc_state, conn_state);

	intel_dsi_vbt_exec_sequence(intel_dsi, MIPI_SEQ_BACKLIGHT_ON);

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

+40 −6
Original line number Diff line number Diff line
@@ -1955,16 +1955,12 @@ static int get_init_otp_deassert_fragment_len(struct drm_i915_private *i915, 
 * these devices we split the init OTP sequence into a deassert sequence and

 * the actual init OTP part.

 */

static void fixup_mipi_sequences(struct drm_i915_private *i915,

static void vlv_fixup_mipi_sequences(struct drm_i915_private *i915,

				     struct intel_panel *panel)

{

	u8 *init_otp;

	int len;



	/* Limit this to VLV for now. */

	if (!IS_VALLEYVIEW(i915))

		return;



	/* Limit this to v1 vid-mode sequences */

	if (panel->vbt.dsi.config->is_cmd_mode ||

	    panel->vbt.dsi.seq_version != 1)
@@ -2000,6 +1996,41 @@ static void fixup_mipi_sequences(struct drm_i915_private *i915, 
	panel->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP] = init_otp + len - 1;

}



/*

 * Some machines (eg. Lenovo 82TQ) appear to have broken

 * VBT sequences:

 * - INIT_OTP is not present at all

 * - what should be in INIT_OTP is in DISPLAY_ON

 * - what should be in DISPLAY_ON is in BACKLIGHT_ON

 *   (along with the actual backlight stuff)

 *

 * To make those work we simply swap DISPLAY_ON and INIT_OTP.

 *

 * TODO: Do we need to limit this to specific machines,

 *       or examine the contents of the sequences to

 *       avoid false positives?

 */

static void icl_fixup_mipi_sequences(struct drm_i915_private *i915,

				     struct intel_panel *panel)

{

	if (!panel->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP] &&

	    panel->vbt.dsi.sequence[MIPI_SEQ_DISPLAY_ON]) {

		drm_dbg_kms(&i915->drm, "Broken VBT: Swapping INIT_OTP and DISPLAY_ON sequences\n");



		swap(panel->vbt.dsi.sequence[MIPI_SEQ_INIT_OTP],

		     panel->vbt.dsi.sequence[MIPI_SEQ_DISPLAY_ON]);

	}

}



static void fixup_mipi_sequences(struct drm_i915_private *i915,

				 struct intel_panel *panel)

{

	if (DISPLAY_VER(i915) >= 11)

		icl_fixup_mipi_sequences(i915, panel);

	else if (IS_VALLEYVIEW(i915))

		vlv_fixup_mipi_sequences(i915, panel);

}



static void

parse_mipi_sequence(struct drm_i915_private *i915,

		    struct intel_panel *panel)
@@ -3351,6 +3382,9 @@ bool intel_bios_encoder_supports_dp_dual_mode(const struct intel_bios_encoder_da 
{

	const struct child_device_config *child = &devdata->child;



	if (!devdata)

		return false;



	if (!intel_bios_encoder_supports_dp(devdata) ||

	    !intel_bios_encoder_supports_hdmi(devdata))

		return false;

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

+1 −3
Original line number Diff line number Diff line
@@ -36,12 +36,10 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state) 
{

	struct drm_i915_private *dev_priv =

		to_i915(plane_state->uapi.plane->dev);

	const struct drm_framebuffer *fb = plane_state->hw.fb;

	struct drm_i915_gem_object *obj = intel_fb_obj(fb);

	u32 base;



	if (DISPLAY_INFO(dev_priv)->cursor_needs_physical)

		base = i915_gem_object_get_dma_address(obj, 0);

		base = plane_state->phys_dma_addr;

	else

		base = intel_plane_ggtt_offset(plane_state);

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −0
Original line number Diff line number Diff line
@@ -727,6 +727,7 @@ struct intel_plane_state { 
#define PLANE_HAS_FENCE BIT(0)



	struct intel_fb_view view;

	u32 phys_dma_addr; /* for cursor_needs_physical */



	/* Plane pxp decryption state */

	bool decrypt;