Commit 9e20b4b8 authored May 14, 2026 by Dave Airlie

Merge tag 'drm-intel-fixes-2026-05-13' of...

Merge tag 'drm-intel-fixes-2026-05-13' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

- Skip __i915_request_skip() for already signaled requests (Sebastian Brzezinka)
- Fix VSC dynamic range signaling for RGB formats [dp] (Chaitanya Kumar Borah)

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Tvrtko Ursulin <tursulin@igalia.com>
Link: https://patch.msgid.link/agSVZmNC_qV4G6jQ@linux

parents 5d691905 1ae15b6c

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -3119,8 +3119,13 @@ static void intel_dp_compute_vsc_colorimetry(const struct intel_crtc_state *crtc
		drm_WARN_ON(display->drm,
		vsc->bpc == 6 && vsc->pixelformat != DP_PIXELFORMAT_RGB);

		/* all YCbCr are always limited range */
		/* All YCbCr formats are always limited range. */
		if (vsc->pixelformat == DP_PIXELFORMAT_RGB)
		vsc->dynamic_range = crtc_state->limited_color_range ?
		DP_DYNAMIC_RANGE_CTA : DP_DYNAMIC_RANGE_VESA;
		else
		vsc->dynamic_range = DP_DYNAMIC_RANGE_CTA;

		vsc->content_type = DP_CONTENT_TYPE_NOT_DEFINED;
		}

drivers/gpu/drm/i915/gt/intel_reset.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -132,6 +132,7 @@ void __i915_request_reset(struct i915_request *rq, bool guilty)
		rcu_read_lock(); /* protect the GEM context */
		if (guilty) {
		i915_request_set_error_once(rq, -EIO);
		if (!i915_request_signaled(rq))
		__i915_request_skip(rq);
		banned = mark_guilty(rq);
		} else {