Skip to content

Commit 61334ed

Browse files
vsyrjalarodrigovivi
authored andcommitted
drm/i915: Reject 90/270 degree rotated initial fbs
We don't currently handle the initial fb readout correctly for 90/270 degree rotated scanout. Reject it. Cc: stable@vger.kernel.org Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201020194330.28568-1-ville.syrjala@linux.intel.com Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (cherry picked from commit a40a830) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent 5cbd768 commit 61334ed

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10636,6 +10636,10 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
1063610636
val & PLANE_CTL_FLIP_HORIZONTAL)
1063710637
plane_config->rotation |= DRM_MODE_REFLECT_X;
1063810638

10639+
/* 90/270 degree rotation would require extra work */
10640+
if (drm_rotation_90_or_270(plane_config->rotation))
10641+
goto error;
10642+
1063910643
base = intel_de_read(dev_priv, PLANE_SURF(pipe, plane_id)) & 0xfffff000;
1064010644
plane_config->base = base;
1064110645

0 commit comments

Comments
 (0)