Skip to contentSkip to conversation

Make PixmapDirtyUpdateRec::src a DrawablePtr

PATCH In review Michel Dänzer 5 participants 9 messages Apr 18, 2017 – Aug 14, 2017 4 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Make PixmapDirtyUpdateRec::src a DrawablePtr

From: Michel Dänzer <[email protected]>

This allows making the master screen's pixmap_dirty_list entries explicitly reflect that we're now tracking the root window instead of the screen pixmap, in order to allow Present page flipping on master outputs while there are active slave outputs.

Define HAS_DIRTYTRACKING_DRAWABLE_SRC for drivers to check, but leave HAS_DIRTYTRACKING_ROTATION defined as well to make things slightly easier for drivers.

---

The Start/StopFlippingPixmapTracking related changes are only compile tested. The rest is smoke tested with the modesetting, amdgpu and radeon drivers.

 dix/pixmap.c                                     | 24 +++++++++++-------------
 hw/xfree86/drivers/modesetting/driver.c          | 10 +++++-----
 hw/xfree86/drivers/modesetting/drmmode_display.c |  5 +++--
 hw/xfree86/drivers/modesetting/drmmode_display.h |  2 +-
 include/pixmap.h                                 |  5 +++--
 include/pixmapstr.h                              |  3 ++-
 include/scrnintstr.h                             |  6 +++---
 randr/randrstr.h                                 |  2 +-
 randr/rrcrtc.c                                   | 20 +++++++++-----------
 9 files changed, 38 insertions(+), 39 deletions(-)
dix/pixmap.c +11 -13
index b67a2e8a6..81ac5e2d8 100644
@@ -181,12 +181,12 @@ PixmapDirtyDamageDestroy(DamagePtr damage, void *closure)
 }
 
 Bool
-PixmapStartDirtyTracking(PixmapPtr src,
+PixmapStartDirtyTracking(DrawablePtr src,
                          PixmapPtr slave_dst,
                          int x, int y, int dst_x, int dst_y,
                          Rotation rotation)
 {
-    ScreenPtr screen = src->drawable.pScreen;
+    ScreenPtr screen = src->pScreen;
     PixmapDirtyUpdatePtr dirty_update;
     RegionPtr damageregion;
     RegionRec dstregion;
@@ -204,8 +204,7 @@ PixmapStartDirtyTracking(PixmapPtr src,
     dirty_update->dst_y = dst_y;
     dirty_update->rotation = rotation;
     dirty_update->damage = DamageCreate(NULL, PixmapDirtyDamageDestroy,
-                                        DamageReportNone,
-                                        TRUE, src->drawable.pScreen,
+                                        DamageReportNone, TRUE, screen,
                                         dirty_update);
 
     if (rotation != RR_Rotate_0) {
@@ -241,16 +240,15 @@ PixmapStartDirtyTracking(PixmapPtr src,
     RegionUnion(damageregion, damageregion, &dstregion);
     RegionUninit(&dstregion);
 
-    DamageRegister(screen->root ? &screen->root->drawable : &src->drawable,
-                   dirty_update->damage);
+    DamageRegister(src, dirty_update->damage);
     xorg_list_add(&dirty_update->ent, &screen->pixmap_dirty_list);
     return TRUE;
 }
 
 Bool
-PixmapStopDirtyTracking(PixmapPtr src, PixmapPtr slave_dst)
+PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst)
 {
-    ScreenPtr screen = src->drawable.pScreen;
+    ScreenPtr screen = src->pScreen;
     PixmapDirtyUpdatePtr ent, safe;
 
     xorg_list_for_each_entry_safe(ent, safe, &screen->pixmap_dirty_list, ent) {
@@ -269,8 +267,8 @@ PixmapDirtyCopyArea(PixmapPtr dst,
                     PixmapDirtyUpdatePtr dirty,
                     RegionPtr dirty_region)
 {
-    ScreenPtr pScreen = dirty->src->drawable.pScreen;
-    DrawablePtr src = pScreen->root ? &pScreen->root->drawable : &dirty->src->drawable;
+    DrawablePtr src = dirty->src;
+    ScreenPtr pScreen = src->pScreen;
     int n;
     BoxPtr b;
     GCPtr pGC;
@@ -309,7 +307,7 @@ PixmapDirtyCompositeRotate(PixmapPtr dst_pixmap,
                            PixmapDirtyUpdatePtr dirty,
                            RegionPtr dirty_region)
 {
-    ScreenPtr pScreen = dirty->src->drawable.pScreen;
+    ScreenPtr pScreen = dirty->src->pScreen;
     PictFormatPtr format = PictureWindowFormat(pScreen->root);
     PicturePtr src, dst;
     XID include_inferiors = IncludeInferiors;
@@ -318,7 +316,7 @@ PixmapDirtyCompositeRotate(PixmapPtr dst_pixmap,
     int error;
 
     src = CreatePicture(None,
-                        &pScreen->root->drawable,
+                        dirty->src,
                         format,
                         CPSubwindowMode,
                         &include_inferiors, serverClient, &error);
@@ -367,7 +365,7 @@ PixmapDirtyCompositeRotate(PixmapPtr dst_pixmap,
  */
 Bool PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty)
 {
-    ScreenPtr pScreen = dirty->src->drawable.pScreen;
+    ScreenPtr pScreen = dirty->src->pScreen;
     RegionPtr region = DamageRegion(dirty->damage);
     PixmapPtr dst;
     SourceValidateProcPtr SourceValidate;
hw/xfree86/drivers/modesetting/driver.c +5 -5
index d7030e5c2..8ce51a502 100644
@@ -1219,12 +1219,12 @@ msDisableSharedPixmapFlipping(RRCrtcPtr crtc)
 }
 
 static Bool
-msStartFlippingPixmapTracking(RRCrtcPtr crtc, PixmapPtr src,
+msStartFlippingPixmapTracking(RRCrtcPtr crtc, DrawablePtr src,
                               PixmapPtr slave_dst1, PixmapPtr slave_dst2,
                               int x, int y, int dst_x, int dst_y,
                               Rotation rotation)
 {
-    ScreenPtr pScreen = src->drawable.pScreen;
+    ScreenPtr pScreen = src->pScreen;
     modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
 
     msPixmapPrivPtr ppriv1 = msGetPixmapPriv(&ms->drmmode, slave_dst1),
@@ -1264,7 +1264,7 @@ msPresentSharedPixmap(PixmapPtr slave_dst)
     RegionPtr region = DamageRegion(ppriv->dirty->damage);
 
     if (RegionNotEmpty(region)) {
-        redisplay_dirty(ppriv->slave_src->drawable.pScreen, ppriv->dirty, NULL);
+        redisplay_dirty(ppriv->slave_src->pScreen, ppriv->dirty, NULL);
         DamageEmpty(ppriv->dirty->damage);
 
         return TRUE;
@@ -1274,10 +1274,10 @@ msPresentSharedPixmap(PixmapPtr slave_dst)
 }
 
 static Bool
-msStopFlippingPixmapTracking(PixmapPtr src,
+msStopFlippingPixmapTracking(DrawablePtr src,
                              PixmapPtr slave_dst1, PixmapPtr slave_dst2)
 {
-    ScreenPtr pScreen = src->drawable.pScreen;
+    ScreenPtr pScreen = src->pScreen;
     modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
 
     msPixmapPrivPtr ppriv1 = msGetPixmapPriv(&ms->drmmode, slave_dst1),
hw/xfree86/drivers/modesetting/drmmode_display.c +3 -2
index 516eb7691..f00fc3194 100644
@@ -857,7 +857,7 @@ drmmode_set_target_scanout_pixmap_gpu(xf86CrtcPtr crtc, PixmapPtr ppix,
     int c, total_width = 0, max_height = 0, this_x = 0;
 
     if (*target) {
-        PixmapStopDirtyTracking(*target, screenpix);
+        PixmapStopDirtyTracking(&(*target)->drawable, screenpix);
         if (drmmode->fb_id) {
             drmModeRmFB(drmmode->fd, drmmode->fb_id);
             drmmode->fb_id = 0;
@@ -897,7 +897,8 @@ drmmode_set_target_scanout_pixmap_gpu(xf86CrtcPtr crtc, PixmapPtr ppix,
         screen->height = screenpix->drawable.height = max_height;
     }
     drmmode_crtc->prime_pixmap_x = this_x;
-    PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+    PixmapStartDirtyTracking(&ppix->drawable, screenpix, 0, 0, this_x, 0,
+                             RR_Rotate_0);
     *target = ppix;
     return TRUE;
 }
hw/xfree86/drivers/modesetting/drmmode_display.h +1 -1
index f774250ef..c86e13f56 100644
@@ -153,7 +153,7 @@ typedef struct _msPixmapPriv {
     /** Source fields for flipping shared pixmaps */
     Bool defer_dirty_update; /* if we want to manually update */
     PixmapDirtyUpdatePtr dirty; /* cached dirty ent to avoid searching list */
-    PixmapPtr slave_src; /* if we exported shared pixmap, dirty tracking src */
+    DrawablePtr slave_src; /* if we exported shared pixmap, dirty tracking src */
     Bool notify_on_damage; /* if sink has requested damage notification */
 } msPixmapPrivRec, *msPixmapPrivPtr;
 
include/pixmap.h +3 -2
index 86b513d47..b7fb25723 100644
@@ -119,14 +119,15 @@ extern _X_EXPORT void
 PixmapUnshareSlavePixmap(PixmapPtr slave_pixmap);
 
 #define HAS_DIRTYTRACKING_ROTATION 1
+#define HAS_DIRTYTRACKING_DRAWABLE_SRC 1
 extern _X_EXPORT Bool
-PixmapStartDirtyTracking(PixmapPtr src,
+PixmapStartDirtyTracking(DrawablePtr src,
                          PixmapPtr slave_dst,
                          int x, int y, int dst_x, int dst_y,
                          Rotation rotation);
 
 extern _X_EXPORT Bool
-PixmapStopDirtyTracking(PixmapPtr src, PixmapPtr slave_dst);
+PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst);
 
 /* helper function, drivers can do this themselves if they can do it more
    efficently */
include/pixmapstr.h +2 -1
index 4bd246562..de501013a 100644
@@ -88,7 +88,8 @@ typedef struct _Pixmap {
 } PixmapRec;
 
 typedef struct _PixmapDirtyUpdate {
-    PixmapPtr src, slave_dst;
+    DrawablePtr src;            /* Root window / shared pixmap */
+    PixmapPtr slave_dst;        /* Shared / scanout pixmap */
     int x, y;
     DamagePtr damage;
     struct xorg_list ent;
include/scrnintstr.h +3 -3
index 207289a91..9b663fa44 100644
@@ -377,7 +377,7 @@ typedef Bool (*SetSharedPixmapBackingProcPtr)(PixmapPtr, void *);
  */
 typedef void (*SyncSharedPixmapProcPtr)(PixmapDirtyUpdatePtr);
 
-typedef Bool (*StartPixmapTrackingProcPtr)(PixmapPtr, PixmapPtr,
+typedef Bool (*StartPixmapTrackingProcPtr)(DrawablePtr, PixmapPtr,
                                            int x, int y,
                                            int dst_x, int dst_y,
                                            Rotation rotation);
@@ -386,9 +386,9 @@ typedef Bool (*PresentSharedPixmapProcPtr)(PixmapPtr);
 
 typedef Bool (*RequestSharedPixmapNotifyDamageProcPtr)(PixmapPtr);
 
-typedef Bool (*StopPixmapTrackingProcPtr)(PixmapPtr, PixmapPtr);
+typedef Bool (*StopPixmapTrackingProcPtr)(DrawablePtr, PixmapPtr);
 
-typedef Bool (*StopFlippingPixmapTrackingProcPtr)(PixmapPtr,
+typedef Bool (*StopFlippingPixmapTrackingProcPtr)(DrawablePtr,
                                                   PixmapPtr, PixmapPtr);
 
 typedef Bool (*SharedPixmapNotifyDamageProcPtr)(PixmapPtr);
randr/randrstr.h +1 -1
index 706e9a7b0..95979a8c6 100644
@@ -279,7 +279,7 @@ typedef Bool (*RRSetConfigProcPtr) (ScreenPtr pScreen,
 
 typedef Bool (*RRCrtcSetScanoutPixmapProcPtr)(RRCrtcPtr crtc, PixmapPtr pixmap);
 
-typedef Bool (*RRStartFlippingPixmapTrackingProcPtr)(RRCrtcPtr, PixmapPtr,
+typedef Bool (*RRStartFlippingPixmapTrackingProcPtr)(RRCrtcPtr, DrawablePtr,
                                                      PixmapPtr, PixmapPtr,
                                                      int x, int y,
                                                      int dst_x, int dst_y,
randr/rrcrtc.c +9 -11
index d1a51f0aa..cdf96df23 100644
@@ -388,12 +388,12 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
 
     if (crtc->scanout_pixmap) {
         ScreenPtr master = crtc->pScreen->current_master;
-        PixmapPtr mscreenpix = master->GetScreenPixmap(master);
+        DrawablePtr mrootdraw = &master->root->drawable;
 
         if (crtc->scanout_pixmap_back) {
             pScrPriv->rrDisableSharedPixmapFlipping(crtc);
 
-            master->StopFlippingPixmapTracking(mscreenpix,
+            master->StopFlippingPixmapTracking(mrootdraw,
                                                crtc->scanout_pixmap,
                                                crtc->scanout_pixmap_back);
 
@@ -402,7 +402,8 @@ RRCrtcDetachScanoutPixmap(RRCrtcPtr crtc)
         }
         else {
             pScrPriv->rrCrtcSetScanoutPixmap(crtc, NULL);
-            master->StopPixmapTracking(mscreenpix, crtc->scanout_pixmap);
+            master->StopPixmapTracking(mrootdraw,
+                                       crtc->scanout_pixmap);
         }
 
         rrDestroySharedPixmap(crtc, crtc->scanout_pixmap);
@@ -491,9 +492,8 @@ rrSetupPixmapSharing(RRCrtcPtr crtc, int width, int height,
     ScreenPtr master = crtc->pScreen->current_master;
     rrScrPrivPtr pMasterScrPriv = rrGetScrPriv(master);
     rrScrPrivPtr pSlaveScrPriv = rrGetScrPriv(crtc->pScreen);
-
-    int depth;
-    PixmapPtr mscreenpix;
+    DrawablePtr mrootdraw = &master->root->drawable;
+    int depth = mrootdraw->depth;
     PixmapPtr spix_front;
 
     /* Create a pixmap on the master screen, then get a shared handle for it.
@@ -515,9 +515,6 @@ rrSetupPixmapSharing(RRCrtcPtr crtc, int width, int height,
        defer to the slave.
     */
 
-    mscreenpix = master->GetScreenPixmap(master);
-    depth = mscreenpix->drawable.depth;
-
     if (crtc->scanout_pixmap)
         RRCrtcDetachScanoutPixmap(crtc);
 
@@ -553,7 +550,8 @@ rrSetupPixmapSharing(RRCrtcPtr crtc, int width, int height,
         crtc->scanout_pixmap = spix_front;
         crtc->scanout_pixmap_back = spix_back;
 
-        if (!pMasterScrPriv->rrStartFlippingPixmapTracking(crtc, mscreenpix,
+        if (!pMasterScrPriv->rrStartFlippingPixmapTracking(crtc,
+                                                           mrootdraw,
                                                            spix_front,
                                                            spix_back,
                                                            x, y, 0, 0,
@@ -588,7 +586,7 @@ fail: /* If flipping funcs fail, just fall back to unsynchronized */
     }
     crtc->scanout_pixmap = spix_front;
 
-    master->StartPixmapTracking(mscreenpix, spix_front, x, y, 0, 0, rotation);
+    master->StartPixmapTracking(mrootdraw, spix_front, x, y, 0, 0, rotation);
 
     return TRUE;
 }
Signature · 6 lines
2.11.0

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

A message that is not in the archive (sent off-list or not yet received): 20170418100754.14621-1-michel-otUistvHUpPR7s880joybQ@public.gmane.org

#2 lore raw

PATCH 1/1 Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

From: Michel Dänzer <[email protected]>

---

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

 src/amdgpu_drv.h      | 26 ++++++++++++++++++++++++++
 src/amdgpu_kms.c      | 18 +++++++++---------
 src/drmmode_display.c |  8 ++++++--
 3 files changed, 41 insertions(+), 11 deletions(-)
src/amdgpu_drv.h +26 -0
index e5c44dc36..9e088e71a 100644
@@ -170,6 +170,32 @@ typedef enum {
 #define AMDGPU_PIXMAP_SHARING 1
 #define amdgpu_is_gpu_screen(screen) (screen)->isGPU
 #define amdgpu_is_gpu_scrn(scrn) (scrn)->is_gpu
+
+static inline ScreenPtr
+amdgpu_dirty_master(PixmapDirtyUpdatePtr dirty)
+{
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+	ScreenPtr screen = dirty->src->pScreen;
+#else
+	ScreenPtr screen = dirty->src->drawable.pScreen;
+#endif
+
+	if (screen->current_master)
+		return screen->current_master;
+
+	return screen;
+}
+
+static inline Bool
+amdgpu_dirty_src_equals(PixmapDirtyUpdatePtr dirty, PixmapPtr pixmap)
+{
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+	return dirty->src == &pixmap->drawable;
+#else
+	return dirty->src == pixmap;
+#endif
+}
+
 #else
 #define amdgpu_is_gpu_screen(screen) 0
 #define amdgpu_is_gpu_scrn(scrn) 0
src/amdgpu_kms.c +9 -9
index 0182cbe0a..29d3d076f 100644
@@ -448,7 +448,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
 static void
 redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
 {
-	ScrnInfoPtr scrn = xf86ScreenToScrn(dirty->src->drawable.pScreen);
+	ScrnInfoPtr scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
 
 	if (RegionNil(region))
 		goto out;
@@ -481,12 +481,12 @@ amdgpu_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data)
 void
 amdgpu_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
 {
-	ScreenPtr master_screen = dirty->src->master_pixmap->drawable.pScreen;
+	ScreenPtr master_screen = amdgpu_dirty_master(dirty);
 	PixmapDirtyUpdatePtr ent;
 	RegionPtr region;
 
 	xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) {
-		if (ent->slave_dst != dirty->src)
+		if (!amdgpu_dirty_src_equals(dirty, ent->slave_dst))
 			continue;
 
 		region = dirty_region(ent);
@@ -501,7 +501,7 @@ amdgpu_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
 static Bool
 master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 {
-	ScreenPtr master_screen = dirty->src->master_pixmap->drawable.pScreen;
+	ScreenPtr master_screen = amdgpu_dirty_master(dirty);
 
 	return master_screen->SyncSharedPixmap != NULL;
 }
@@ -517,7 +517,7 @@ slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 static void
 call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
 {
-	ScreenPtr master_screen = dirty->src->master_pixmap->drawable.pScreen;
+	ScreenPtr master_screen = amdgpu_dirty_master(dirty);
 
 	master_screen->SyncSharedPixmap(dirty);
 }
@@ -527,7 +527,7 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty)
 static Bool
 master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty)
 {
-	ScrnInfoPtr master_scrn = xf86ScreenToScrn(dirty->src->master_pixmap->drawable.pScreen);
+	ScrnInfoPtr master_scrn = xf86ScreenToScrn(amdgpu_dirty_master(dirty));
 
 	return master_scrn->driverName == scrn->driverName;
 }
@@ -581,7 +581,7 @@ amdgpu_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id)
 	Bool ret = FALSE;
 
 	xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) {
-		if (dirty->src == scanoutpix && dirty->slave_dst ==
+		if (amdgpu_dirty_src_equals(dirty, scanoutpix) && dirty->slave_dst ==
 		    drmmode_crtc->scanout[scanout_id ^ drmmode_crtc->tear_free].pixmap) {
 			RegionPtr region;
 
@@ -738,10 +738,10 @@ amdgpu_dirty_update(ScrnInfoPtr scrn)
 			PixmapDirtyUpdatePtr region_ent = ent;
 
 			if (master_has_sync_shared_pixmap(scrn, ent)) {
-				ScreenPtr master_screen = ent->src->master_pixmap->drawable.pScreen;
+				ScreenPtr master_screen = amdgpu_dirty_master(ent);
 
 				xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) {
-					if (region_ent->slave_dst == ent->src)
+					if (amdgpu_dirty_src_equals(ent, region_ent->slave_dst))
 						break;
 				}
 			}
src/drmmode_display.c +6 -2
index 5e0c4133b..06103ed56 100644
@@ -681,7 +681,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode,
 
 		xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list,
 					 ent) {
-			if (dirty->src == crtc->randr_crtc->scanout_pixmap &&
+			if (amdgpu_dirty_src_equals(dirty, crtc->randr_crtc->scanout_pixmap) &&
 			    dirty->slave_dst ==
 			    drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap) {
 				dirty->slave_dst =
@@ -1216,7 +1216,11 @@ static Bool drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
 		return FALSE;
 	}
 
-#ifdef HAS_DIRTYTRACKING_ROTATION
+#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
+	PixmapStartDirtyTracking(&ppix->drawable,
+				 drmmode_crtc->scanout[scanout_id].pixmap,
+				 0, 0, 0, 0, RR_Rotate_0);
+#elif defined(HAS_DIRTYTRACKING_ROTATION)
 	PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[scanout_id].pixmap,
 				 0, 0, 0, 0, RR_Rotate_0);
 #elif defined(HAS_DIRTYTRACKING2)
Signature · 6 lines
2.11.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau
#3 lore raw

Re: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

Quoted 7 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

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

Re: [Nouveau] [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

Quoted 6 lines · Michel Dänzer
Quoted 5 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Quoted 8 lines
Quoted 2 lines

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

Sorry, I'm not 1000% clear on what this patch is doing. Is it literally just a type change from A to B and so code has to be fixed up for the new API? Or are there further implications like having to do/support new things?

Thanks,

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

A message that is not in the archive (sent off-list or not yet received): CAKb7Uvi=u3yL3v4yQhNiJVVgYhOYNRvxOD07SfRkvd8mBETrYg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#6 lore raw

Re: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

Quoted 10 lines · Ilia Mirkin
Quoted 9 lines · Michel Dänzer
Quoted 7 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Quoted 7 lines
Quoted 5 lines

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

Sorry, I'm not 1000% clear on what this patch is doing.

100% should suffice. ;)

Quoted 2 lines

Is it literally just a type change from A to B and so code has to be fixed up for the new API?

That's basically it, corresponding to
https://patchwork.freedesktop.org/patch/150938/ .

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

A message that is not in the archive (sent off-list or not yet received): c687252a-1bc4-41b9-d022-4c7dff5e6675-otUistvHUpPR7s880joybQ@public.gmane.org

#8 lore raw

Re: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

Quoted 19 lines · Michel Dänzer
Quoted 10 lines · Ilia Mirkin
Quoted 9 lines · Michel Dänzer
Quoted 7 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Quoted 7 lines
Quoted 5 lines

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

Sorry, I'm not 1000% clear on what this patch is doing.

Quoted 7 lines

100% should suffice. ;)

Quoted 2 lines

Is it literally just a type change from A to B and so code has to be fixed up for the new API?

That's basically it, corresponding to
https://patchwork.freedesktop.org/patch/150938/ .

From a brief glance at nouveau, it never uses PixmapDirtyUpdate, except in src/nv_driver.c where I don't think the code would need to be updated.

https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/tree/src/nv_driver.c#n552

Let me know if you think I'm off.

-ilia
_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

A message that is not in the archive (sent off-list or not yet received): CAKb7UvgJ6kY0gZCf+XnkobcYCK9zRQBPgrvu2iuShgKMTUeW9w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#10 lore raw

Re: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

Quoted 25 lines · Ilia Mirkin
Quoted 24 lines · Michel Dänzer
Quoted 10 lines · Ilia Mirkin
Quoted 9 lines · Michel Dänzer
Quoted 7 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Quoted 7 lines
Quoted 5 lines

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

Sorry, I'm not 1000% clear on what this patch is doing.

100% should suffice. ;)

Quoted 2 lines

Is it literally just a type change from A to B and so code has to be fixed up for the new API?

Quoted 8 lines
Quoted 2 lines

That's basically it, corresponding to
https://patchwork.freedesktop.org/patch/150938/ .

From a brief glance at nouveau, it never uses PixmapDirtyUpdate, except in src/nv_driver.c where I don't think the code would need to be updated.

https://cgit.freedesktop.org/nouveau/xf86-video-nouveau/tree/src/nv_driver.c#n552

There's also PixmapStart/StopDirtyTracking, though it looks like those might happen to work as well at runtime, if you don't mind the compiler warnings.

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

Re: [PATCH xf86-video-amdgpu] Adapt to PixmapDirtyUpdateRec::src being a DrawablePtr

In reply to Michel Dänzer
Quoted 6 lines · Michel Dänzer
Quoted 5 lines · Michel Dänzer

From: Michel Dänzer <[email protected]>

---

Quoted 8 lines
Quoted 2 lines

Chris / Ilia / Ben, this should be manageable for the intel/nouveau drivers, right?

Any feedback, guys?

I want to push the xserver change soon-ish. I could probably come up with a corresponding patch for nouveau in the worst case, but I'm afraid not for intel.

Chris,

in response to your bugzilla comment
https://bugs.freedesktop.org/show_bug.cgi?id=100086#c9 and patch
https://patchwork.freedesktop.org/patch/143180/, I drafted how the ABI could be fixed to reflect current usage in the first comment to your patch. There was no response in a month, so I went ahead and wrote
https://patchwork.freedesktop.org/patch/150938/ . After three months with no feedback, I followed up with the ping above. After almost another month without feedback from you, I pinged you about it on IRC, again no response.

I'm afraid my patience has run out, I'll push the xserver patch next week. Until the xf86-video-intel SNA driver is fixed up, it'll continue being broken as the master screen driver with RandR 1.4 slave scanout.

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

From: Michel Dänzer <[email protected]>

This allows making the master screen's pixmap_dirty_list entries explicitly reflect that we're now tracking the root window instead of the screen pixmap, in order to allow Present page flipping on master outputs while there are active slave outputs.

Quoted 5 lines

Define HAS_DIRTYTRACKING_DRAWABLE_SRC for drivers to check, but leave HAS_DIRTYTRACKING_ROTATION defined as well to make things slightly easier for drivers.

- ajax
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel