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

Merge tag 'drm-intel-next-fixes-2026-04-16' of... 

Merge tag 'drm-intel-next-fixes-2026-04-16' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-next

- Fix VESA backlight possible check condition [backlight] (Suraj Kandpal)
- Verify the correct plane DDB entry [wm] (Ville Syrjälä)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patch.msgid.link/aeCGoL4FFwT66bF4@linux
parents 993eb191 a97c88a1

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

+7 −2
Original line number Diff line number Diff line
@@ -615,8 +615,13 @@ check_if_vesa_backlight_possible(struct intel_dp *intel_dp) 
	int ret;

	u8 bit_min, bit_max;



	if (!(intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP))

		return true;

	/*

	 * Since we only support Fully AUX Based VESA Backlight interface make sure

	 * backlight enable is possible via AUX along with backlight adjustment

	 */

	if (!(intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP &&

	      intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP))

		return false;



	ret = drm_dp_dpcd_read_byte(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &bit_min);

	if (ret < 0)

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

+2 −2
Original line number Diff line number Diff line
@@ -4028,8 +4028,8 @@ void intel_wm_state_verify(struct intel_atomic_state *state, 
		}



		/* DDB */

		hw_ddb_entry = &hw->ddb[PLANE_CURSOR];

		sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[PLANE_CURSOR];

		hw_ddb_entry = &hw->ddb[plane->id];

		sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[plane->id];



		if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) {

			drm_err(display->drm,