|
 |
55d6a0 |
From 7f1bedcf27cfd09162544ff1b18c21c8e5695a9d Mon Sep 17 00:00:00 2001
|
|
|
55d6a0 |
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
|
|
|
55d6a0 |
Date: Fri, 22 Nov 2019 18:05:04 +0100
|
|
|
55d6a0 |
Subject: [PATCH xserver 08/11] modesetting: Add glamor_finish() convenience
|
|
|
55d6a0 |
macro
|
|
|
55d6a0 |
|
|
|
55d6a0 |
This will simplify backporting the following fix to the 1.20 branch.
|
|
|
55d6a0 |
|
|
|
55d6a0 |
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
|
55d6a0 |
(cherry picked from commit 06ef320e9bc1f1098df9cd5581f072528f28128e)
|
|
|
55d6a0 |
---
|
|
|
55d6a0 |
hw/xfree86/drivers/modesetting/driver.c | 2 +-
|
|
|
55d6a0 |
hw/xfree86/drivers/modesetting/driver.h | 2 ++
|
|
|
55d6a0 |
hw/xfree86/drivers/modesetting/drmmode_display.c | 2 +-
|
|
|
55d6a0 |
3 files changed, 4 insertions(+), 2 deletions(-)
|
|
|
55d6a0 |
|
|
|
55d6a0 |
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
|
|
|
55d6a0 |
index 4f4db67b7..afba8538a 100644
|
|
|
55d6a0 |
--- a/hw/xfree86/drivers/modesetting/driver.c
|
|
|
55d6a0 |
+++ b/hw/xfree86/drivers/modesetting/driver.c
|
|
|
55d6a0 |
@@ -615,7 +615,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty, int *timeout)
|
|
|
55d6a0 |
* the shared pixmap, but not all).
|
|
|
55d6a0 |
*/
|
|
|
55d6a0 |
if (ms->drmmode.glamor)
|
|
|
55d6a0 |
- ms->glamor.finish(screen);
|
|
|
55d6a0 |
+ glamor_finish(screen);
|
|
|
55d6a0 |
#endif
|
|
|
55d6a0 |
/* Ensure the slave processes the damage immediately */
|
|
|
55d6a0 |
if (timeout)
|
|
|
55d6a0 |
diff --git a/hw/xfree86/drivers/modesetting/driver.h b/hw/xfree86/drivers/modesetting/driver.h
|
|
|
55d6a0 |
index 5e4d2509a..c6e7cd0c8 100644
|
|
|
55d6a0 |
--- a/hw/xfree86/drivers/modesetting/driver.h
|
|
|
55d6a0 |
+++ b/hw/xfree86/drivers/modesetting/driver.h
|
|
|
55d6a0 |
@@ -158,6 +158,8 @@ typedef struct _modesettingRec {
|
|
|
55d6a0 |
|
|
|
55d6a0 |
} modesettingRec, *modesettingPtr;
|
|
|
55d6a0 |
|
|
|
55d6a0 |
+#define glamor_finish(screen) ms->glamor.finish(screen)
|
|
|
55d6a0 |
+
|
|
|
55d6a0 |
#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
|
|
|
55d6a0 |
modesettingEntPtr ms_ent_priv(ScrnInfoPtr scrn);
|
|
|
55d6a0 |
|
|
|
55d6a0 |
diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
|
55d6a0 |
index 28609db7c..6516fac5f 100644
|
|
|
55d6a0 |
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
|
55d6a0 |
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
|
|
|
55d6a0 |
@@ -770,7 +770,7 @@ drmmode_crtc_set_mode(xf86CrtcPtr crtc, Bool test_only)
|
|
|
55d6a0 |
#ifdef GLAMOR_HAS_GBM
|
|
|
55d6a0 |
/* Make sure any pending drawing will be visible in a new scanout buffer */
|
|
|
55d6a0 |
if (drmmode->glamor)
|
|
|
55d6a0 |
- ms->glamor.finish(screen);
|
|
|
55d6a0 |
+ glamor_finish(screen);
|
|
|
55d6a0 |
#endif
|
|
|
55d6a0 |
|
|
|
55d6a0 |
if (ms->atomic_modeset) {
|
|
|
55d6a0 |
--
|
|
|
55d6a0 |
2.33.1
|
|
|
55d6a0 |
|