summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2019-07-24 15:55:19 +0200
committerMichel Dänzer <michel@daenzer.net>2019-08-07 18:11:20 +0200
commit5bb2580b266468f87843b5585ae64e056b63bb88 (patch)
tree3260a87bd8918779d500cb12b6c60d9cc033cf82
parentac66086613cbd0974b421cd5eda872adc15242ed (diff)
present: Don't check pixmap pitch in check_flip with current DC
Current DC handles flipping between different pitches correctly. Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
-rw-r--r--src/amdgpu_present.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/amdgpu_present.c b/src/amdgpu_present.c
index 45a969d..7d46d52 100644
--- a/src/amdgpu_present.c
+++ b/src/amdgpu_present.c
@@ -274,9 +274,6 @@ amdgpu_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
if (info->drmmode.dri2_flipping)
return FALSE;
- if (pixmap->devKind != screen_pixmap->devKind)
- return FALSE;
-
if (priv && priv->fb_failed)
return FALSE;
@@ -300,8 +297,11 @@ amdgpu_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
if (info->dri2.pKernelDRMVersion->version_minor < 31 ||
!drmmode_cm_enabled(&info->drmmode)) {
/* The kernel driver doesn't handle flipping between BOs with
- * different tiling parameters correctly
+ * different pitch / tiling parameters correctly
*/
+ if (pixmap->devKind != screen_pixmap->devKind)
+ return FALSE;
+
if (amdgpu_pixmap_get_tiling_info(pixmap) !=
amdgpu_pixmap_get_tiling_info(screen_pixmap))
return FALSE;