From 790575ea74dd5d17a721bb1217b7b95d571139d0 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 1 Nov 2022 18:08:46 -0700 Subject: Updated to 6.0.6 --- ...r-Use-full-update-In-case-of-area-calcula.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 0002-drm-i915-psr-Use-full-update-In-case-of-area-calcula.patch (limited to '0002-drm-i915-psr-Use-full-update-In-case-of-area-calcula.patch') diff --git a/0002-drm-i915-psr-Use-full-update-In-case-of-area-calcula.patch b/0002-drm-i915-psr-Use-full-update-In-case-of-area-calcula.patch deleted file mode 100644 index 5416258..0000000 --- a/0002-drm-i915-psr-Use-full-update-In-case-of-area-calcula.patch +++ /dev/null @@ -1,65 +0,0 @@ -From f741527431e0510b876d68c7e7ec4286cbd41a24 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jouni=20H=C3=B6gander?= -Date: Fri, 13 May 2022 17:28:10 +0300 -Subject: [PATCH 2/9] drm/i915/psr: Use full update In case of area calculation - fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Currently we have some corner cases where area calculation fails. For -these sel fetch area calculation ends up having update area as y1 = 0, -y2 = 4. Instead of these values safer option is full update. - -One of such for example is big fb with offset. We don't have usable -offset in psr2_sel_fetch_update. Currently it's open what is the -proper way to fix this corner case. Use full update for now. - -v2: Commit message modified -v3: Print out debug info once when area calculation fails -v4: Use drm_info_once -v5: pipeA -> "pipe %c", pipe_name(crtc-pipe) - -Cc: José Roberto de Souza -Cc: Mika Kahola -Signed-off-by: Jouni Högander -Reviewed-by: José Roberto de Souza ---- - drivers/gpu/drm/i915/display/intel_psr.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c -index 8f09203e0cf0..a0571c7249f1 100644 ---- a/drivers/gpu/drm/i915/display/intel_psr.c -+++ b/drivers/gpu/drm/i915/display/intel_psr.c -@@ -1691,6 +1691,7 @@ static bool psr2_sel_fetch_pipe_state_supported(const struct intel_crtc_state *c - int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, - struct intel_crtc *crtc) - { -+ struct drm_i915_private *dev_priv = to_i915(state->base.dev); - struct intel_crtc_state *crtc_state = intel_atomic_get_new_crtc_state(state, crtc); - struct drm_rect pipe_clip = { .x1 = 0, .y1 = -1, .x2 = INT_MAX, .y2 = -1 }; - struct intel_plane_state *new_plane_state, *old_plane_state; -@@ -1776,6 +1777,19 @@ int intel_psr2_sel_fetch_update(struct intel_atomic_state *state, - clip_area_update(&pipe_clip, &damaged_area); - } - -+ /* -+ * TODO: For now we are just using full update in case -+ * selective fetch area calculation fails. To optimize this we -+ * should identify cases where this happens and fix the area -+ * calculation for those. -+ */ -+ if (pipe_clip.y1 == -1) { -+ drm_info_once(&dev_priv->drm, -+ "Selective fetch area calculation failed in pipe %c\n", -+ pipe_name(crtc->pipe)); -+ full_update = true; -+ } -+ - if (full_update) - goto skip_sel_fetch_set_loop; - --- -2.37.2 - -- cgit v1.2.1