xserver-xorg-video-ati: Changes to 'ubuntu'
debian/patches/xmir.patch | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
New commits:
commit eff534ce056c4696849711192e8922e771fa0829
Author: Maarten Lankhorst <maarten.lankhorst@ubuntu.com>
Date: Mon Mar 9 10:51:42 2015 +0100
refresh xmir patch
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index b3c3dfc..fe8489a 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -8,7 +8,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -1947,7 +1947,7 @@
+@@ -1958,7 +1958,7 @@
if (!miCreateDefColormap(pScreen))
return FALSE;
/* all radeons support 10 bit CLUTs */
@@ -167,7 +167,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
dri2_info.CreateBuffer2 = radeon_dri2_create_buffer2;
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
-@@ -326,12 +326,12 @@
+@@ -325,12 +325,12 @@
Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *fd_handle)
{
struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix);
@@ -301,7 +301,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
}
static void
-@@ -616,6 +685,17 @@
+@@ -608,6 +677,17 @@
dev->domain, dev->bus, dev->dev, dev->func);
#endif
@@ -319,7 +319,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
fd = drmOpen(NULL, busid);
if (fd == -1)
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -646,6 +726,9 @@
+@@ -638,6 +718,9 @@
if (info->dri2.drm_fd == -1)
return FALSE;
@@ -329,7 +329,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
/* Check that what we opened was a master or a master-capable FD,
* by setting the version of the interface we'll use to talk to it.
* (see DRIOpenDRMMaster() in DRI1)
-@@ -866,6 +949,14 @@
+@@ -854,6 +937,14 @@
if (!RADEONPreInitChipType_KMS(pScrn))
goto fail;
@@ -344,7 +344,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (radeon_open_drm_master(pScrn) == FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
goto fail;
-@@ -940,10 +1031,14 @@
+@@ -928,10 +1019,14 @@
}
info->swapBuffersWait = xf86ReturnOptValBool(info->Options,
@@ -360,7 +360,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (drmmode_pre_init(pScrn, &info->drmmode, pScrn->bitsPerPixel / 8) == FALSE) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
goto fail;
-@@ -953,7 +1048,10 @@
+@@ -941,7 +1036,10 @@
pRADEONEnt->HasCRTC2 = FALSE;
else
pRADEONEnt->HasCRTC2 = TRUE;
@@ -372,16 +372,16 @@ Date: Mon Jul 22 17:02:17 2013 +1000
/* fix up cloning on rn50 cards
* since they only have one crtc sometimes the xserver doesn't assign
-@@ -1131,7 +1229,7 @@
- {
- RADEONInfoPtr info = RADEONPTR(pScrn);
+@@ -1121,7 +1219,7 @@
+ #ifdef XF86_PDEV_SERVER_FD
RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
+ #endif
- int err;
+ int err = 0;
#ifdef XF86_PDEV_SERVER_FD
if (pRADEONEnt->platform_dev &&
-@@ -1139,7 +1237,8 @@
+@@ -1129,7 +1227,8 @@
return TRUE;
#endif
@@ -391,7 +391,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (err)
ErrorF("Unable to retrieve master\n");
-@@ -1157,6 +1256,11 @@
+@@ -1147,6 +1246,11 @@
return;
#endif
@@ -403,7 +403,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
drmDropMaster(info->dri2.drm_fd);
}
-@@ -1214,6 +1318,21 @@
+@@ -1204,6 +1308,21 @@
RADEONFreeRec(pScrn);
}
@@ -425,7 +425,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-@@ -1246,7 +1365,8 @@
+@@ -1236,7 +1355,8 @@
"failed to initialise GEM buffer manager");
return FALSE;
}
@@ -435,7 +435,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (!info->csm)
info->csm = radeon_cs_manager_gem_ctor(info->dri2.drm_fd);
-@@ -1370,7 +1490,10 @@
+@@ -1360,7 +1480,10 @@
/* Cursor setup */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
@@ -447,7 +447,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (RADEONCursorInit_KMS(pScreen)) {
}
}
-@@ -1412,6 +1535,8 @@
+@@ -1402,6 +1525,8 @@
info->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
@@ -456,7 +456,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
#ifdef RADEON_PIXMAP_SHARING
pScreen->StartPixmapTracking = PixmapStartDirtyTracking;
pScreen->StopPixmapTracking = PixmapStopDirtyTracking;
-@@ -1457,7 +1582,9 @@
+@@ -1447,7 +1572,9 @@
pScrn->vtSema = TRUE;
@@ -467,7 +467,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
return FALSE;
return TRUE;
-@@ -1598,6 +1725,7 @@
+@@ -1588,6 +1715,7 @@
}
info->front_surface = surface;
}
Reply to: