Skip to contentSkip to conversation

Allow changing DCC parameters between flips

PATCH In review Marek Olšák 2 participants 4 messages Feb 28, 2019 – Apr 3, 2019 3 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Allow changing DCC parameters between flips

From: Marek Olšák <[email protected]>

---
 src/amdgpu_present.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
src/amdgpu_present.c +12 -4
index ce88bd8f..f4fc6ebd 100644
@@ -271,26 +271,34 @@ amdgpu_present_check_flip(RRCrtcPtr crtc, WindowPtr window, PixmapPtr pixmap,
 		return FALSE;
 
 	if (info->drmmode.dri2_flipping)
 		return FALSE;
 
 #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(1, 20, 99, 1, 0)
 	if (pixmap->devKind != screen_pixmap->devKind)
 		return FALSE;
 #endif
 
+	uint64_t tiling_info1 = amdgpu_pixmap_get_tiling_info(pixmap);
+	uint64_t tiling_info2 = amdgpu_pixmap_get_tiling_info(screen_pixmap);
+
 	/* The kernel driver doesn't handle flipping between BOs with different
-	 * tiling parameters correctly yet
+	 * tiling parameters correctly yet except DCC.
 	 */
-	if (amdgpu_pixmap_get_tiling_info(pixmap) !=
-	    amdgpu_pixmap_get_tiling_info(screen_pixmap))
-		return FALSE;
+	if (info->family >= AMDGPU_FAMILY_AI) {
+		if (AMDGPU_TILING_GET(tiling_info1, SWIZZLE_MODE) !=
+		    AMDGPU_TILING_GET(tiling_info2, SWIZZLE_MODE))
+			return FALSE;
+	} else {
+		if (tiling_info1 != tiling_info2)
+			return FALSE;
+	}
 
 	for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
 		if (drmmode_crtc_can_flip(config->crtc[i]))
 			num_crtcs_on++;
 		else if (config->crtc[i] == crtc->devPrivate)
 			return FALSE;
 	}
 
 	if (num_crtcs_on == 0)
 		return FALSE;
Signature · 6 lines
2.17.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#2 lore raw
In reply to a message not in the archive

Thanks Marek for the patch, but xf86-video-amdgpu patches are being reviewed as GitLab merge requests since the last release[0].

I'll create a merge request with this patch and some follow-up changes.

[0] Isn't README.md clear enough on this?

Signature · 6 lines
Earthling Michel Dänzer               |              https://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#4 lore raw
In reply to a message not in the archive

As you probably noticed, I don't use gitlab for my own patches yet.

Marek

Quoted 4 lines · Michel Dänzer

Thanks Marek for the patch, but xf86-video-amdgpu patches are being reviewed as GitLab merge requests since the last release[0].

Quoted 9 lines

I'll create a merge request with this patch and some follow-up changes.

[0] Isn't README.md clear enough on this?

--
Earthling Michel Dänzer | https://www.amd.com
Libre software enthusiast | Mesa and X developer

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw
In reply to a message not in the archive
Quoted 1 line · Marek Olšák

As you probably noticed, I don't use gitlab for my own patches yet.

It's not optional for xf86-video-amdgpu.

Per
https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/merge_requests/30#note_125584
, I ended up not using this patch, instead only allowing the DCC parameters to change with DRM minor version >= 31 as well. Thanks for this patch anyway!

Signature · 6 lines
Earthling Michel Dänzer               |              https://www.amd.com
Libre software enthusiast             |             Mesa and X developer
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx