Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Dave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patch.msgid.link/aeCGoL4FFwT66bF4@linux
+9
-4
+7
-2
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
+7
-2
drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c
···
615
615
int ret;
616
616
u8 bit_min, bit_max;
617
617
618
-
if (!(intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP))
619
-
return true;
618
+
/*
619
+
* Since we only support Fully AUX Based VESA Backlight interface make sure
620
+
* backlight enable is possible via AUX along with backlight adjustment
621
+
*/
622
+
if (!(intel_dp->edp_dpcd[1] & DP_EDP_BACKLIGHT_AUX_ENABLE_CAP &&
623
+
intel_dp->edp_dpcd[2] & DP_EDP_BACKLIGHT_BRIGHTNESS_AUX_SET_CAP))
624
+
return false;
620
625
621
626
ret = drm_dp_dpcd_read_byte(&intel_dp->aux, DP_EDP_PWMGEN_BIT_COUNT_CAP_MIN, &bit_min);
622
627
if (ret < 0)
+2
-2
drivers/gpu/drm/i915/display/skl_watermark.c
+2
-2
drivers/gpu/drm/i915/display/skl_watermark.c
···
4028
4028
}
4029
4029
4030
4030
/* DDB */
4031
-
hw_ddb_entry = &hw->ddb[PLANE_CURSOR];
4032
-
sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[PLANE_CURSOR];
4031
+
hw_ddb_entry = &hw->ddb[plane->id];
4032
+
sw_ddb_entry = &new_crtc_state->wm.skl.plane_ddb[plane->id];
4033
4033
4034
4034
if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) {
4035
4035
drm_err(display->drm,