xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 13 +++++++++++++
debian/patches/xmir.patch | 20 ++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
New commits:
commit 88c26a31ecb8f73208b2fa8947fda9f11731aeeb
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Tue Sep 17 13:12:45 2013 -0400
Really fix the ati build
diff --git a/debian/changelog b/debian/changelog
index f2e9051..c386cef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-xserver-xorg-video-ati (1:7.2.0-0ubuntu5) saucy; urgency=low
+xserver-xorg-video-ati (1:7.2.0-0ubuntu6) saucy; urgency=low
+
+ * Fix the build harder. This would be easier if my powerpc schroot actually
+ worked.
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Tue, 03 Sep 2013 16:34:44 +1000
+
+axserver-xorg-video-ati (1:7.2.0-0ubuntu5) saucy; urgency=low
* Fix the build on platforms without XMir. Hello, PPC!
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 89eaa3b..ecfb241 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -285,16 +285,18 @@ Date: Mon Jul 22 17:02:17 2013 +1000
static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL)
{
SCREEN_PTR(arg);
-@@ -302,6 +366,8 @@
+@@ -302,6 +366,10 @@
#ifdef RADEON_PIXMAP_SHARING
radeon_dirty_update(pScreen);
#endif
++#ifdef XMIR
+ if(info->xmir)
-+ xmir_screen_for_each_damaged_window(info->xmir, radeon_xmir_copy_to_mir);
++ xmir_screen_for_each_damaged_window(info->xmir, radeon_xmir_copy_to_mir);
++#endif
}
static void
-@@ -606,6 +672,22 @@
+@@ -606,6 +674,22 @@
dev->domain, dev->bus, dev->dev, dev->func);
#endif
@@ -317,7 +319,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
info->dri2.drm_fd = drmOpen("radeon", busid);
if (info->dri2.drm_fd == -1) {
-@@ -835,6 +917,14 @@
+@@ -835,6 +919,14 @@
if (!RADEONPreInitChipType_KMS(pScrn))
goto fail;
@@ -332,7 +334,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;
-@@ -909,10 +999,14 @@
+@@ -909,10 +1001,14 @@
}
info->swapBuffersWait = xf86ReturnOptValBool(info->Options,
@@ -348,7 +350,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;
-@@ -922,7 +1016,10 @@
+@@ -922,7 +1018,10 @@
pRADEONEnt->HasCRTC2 = FALSE;
else
pRADEONEnt->HasCRTC2 = TRUE;
@@ -360,7 +362,7 @@ 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
-@@ -1122,6 +1219,11 @@
+@@ -1122,6 +1221,11 @@
if (info->accel_state->use_vbos)
radeon_vbo_free_lists(pScrn);
@@ -372,7 +374,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
drmDropMaster(info->dri2.drm_fd);
drmmode_fini(pScrn, &info->drmmode);
-@@ -1150,6 +1252,21 @@
+@@ -1150,6 +1254,21 @@
RADEONFreeRec(pScrn);
}
@@ -394,7 +396,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-@@ -1157,7 +1274,7 @@
+@@ -1157,7 +1276,7 @@
int subPixelOrder = SubPixelUnknown;
char* s;
void *front_ptr;
@@ -403,7 +405,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
pScrn->fbOffset = 0;
-@@ -1168,7 +1285,8 @@
+@@ -1168,7 +1287,8 @@
pScrn->defaultVisual)) return FALSE;
miSetPixmapDepths ();
@@ -413,7 +415,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (ret) {
ErrorF("Unable to retrieve master\n");
return FALSE;
-@@ -1185,7 +1303,8 @@
+@@ -1185,7 +1305,8 @@
"failed to initialise GEM buffer manager");
return FALSE;
}
@@ -423,7 +425,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (!info->csm)
info->csm = radeon_cs_manager_gem_ctor(info->dri2.drm_fd);
-@@ -1309,7 +1428,10 @@
+@@ -1309,7 +1430,10 @@
/* Cursor setup */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
@@ -435,7 +437,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (RADEONCursorInit_KMS(pScreen)) {
}
}
-@@ -1351,6 +1473,8 @@
+@@ -1351,6 +1475,8 @@
info->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
@@ -444,7 +446,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
#ifdef RADEON_PIXMAP_SHARING
pScreen->StartPixmapTracking = PixmapStartDirtyTracking;
pScreen->StopPixmapTracking = PixmapStopDirtyTracking;
-@@ -1385,13 +1509,13 @@
+@@ -1385,13 +1511,13 @@
{
SCRN_INFO_PTR(arg);
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -461,7 +463,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (ret)
ErrorF("Unable to retrieve master\n");
info->accel_state->XInited3D = FALSE;
-@@ -1399,7 +1523,9 @@
+@@ -1399,7 +1525,9 @@
pScrn->vtSema = TRUE;
@@ -472,7 +474,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
return FALSE;
return TRUE;
-@@ -1414,7 +1540,8 @@
+@@ -1414,7 +1542,8 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"RADEONLeaveVT_KMS\n");
@@ -482,7 +484,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
xf86RotateFreeShadow(pScrn);
-@@ -1540,6 +1667,7 @@
+@@ -1540,6 +1669,7 @@
}
info->front_surface = surface;
}
commit 29b4eeb4b097058ea02a6daba1038cdcc5296ae3
Author: Christopher James Halse Rogers <raof@ubuntu.com>
Date: Mon Sep 2 13:23:16 2013 +1000
Fix PPC build
diff --git a/debian/changelog b/debian/changelog
index 8bfb6e1..f2e9051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-video-ati (1:7.2.0-0ubuntu5) saucy; urgency=low
+
+ * Fix the build on platforms without XMir. Hello, PPC!
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 02 Sep 2013 13:22:54 +1000
+
xserver-xorg-video-ati (1:7.2.0-0ubuntu4) saucy; urgency=low
* Update for new XMir API
diff --git a/debian/patches/xmir.patch b/debian/patches/xmir.patch
index 4fdbbf8..89eaa3b 100644
--- a/debian/patches/xmir.patch
+++ b/debian/patches/xmir.patch
@@ -19,7 +19,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
#if 0 /* This option messes up text mode! (eich@suse.de) */
--- a/src/radeon.h
+++ b/src/radeon.h
-@@ -87,6 +87,14 @@
+@@ -87,6 +87,18 @@
#include "picturestr.h"
#endif
@@ -29,12 +29,16 @@ Date: Mon Jul 22 17:02:17 2013 +1000
+#else
+#define xorgMir 0
+typedef struct xmir_screen xmir_screen;
++typedef struct xmir_window xmir_window;
++void xmir_screen_for_each_damaged_window(void *, void *);
++int xmir_get_drm_fd(const char *busid);
++void xmir_screen_init(ScreenPtr screen, void *);
+#endif
+
#include "compat-api.h"
#include "simple_list.h"
-@@ -480,9 +488,12 @@
+@@ -480,9 +492,12 @@
/* Perform vsync'ed SwapBuffers? */
Bool swapBuffersWait;
@@ -218,6 +222,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
}
#endif
++#ifdef XMIR
+static void
+radeon_xmir_copy_to_mir(xmir_window *xmir_win, RegionPtr region)
+{
@@ -271,7 +276,6 @@ Date: Mon Jul 22 17:02:17 2013 +1000
+ }
+}
+
-+#ifdef XMIR
+static xmir_driver xmir_radeon_driver = {
+ XMIR_DRIVER_VERSION,
+ radeon_xmir_copy_to_mir
@@ -290,11 +294,10 @@ Date: Mon Jul 22 17:02:17 2013 +1000
}
static void
-@@ -606,6 +672,24 @@
+@@ -606,6 +672,22 @@
dev->domain, dev->bus, dev->dev, dev->func);
#endif
-+#ifdef XMIR
+ if (xorgMir) {
+ info->dri2.drm_fd = xmir_get_drm_fd(busid);
+
@@ -310,12 +313,11 @@ Date: Mon Jul 22 17:02:17 2013 +1000
+ pRADEONEnt->fd */
+ goto out;
+ }
-+#endif
+
info->dri2.drm_fd = drmOpen("radeon", busid);
if (info->dri2.drm_fd == -1) {
-@@ -835,6 +919,14 @@
+@@ -835,6 +917,14 @@
if (!RADEONPreInitChipType_KMS(pScrn))
goto fail;
@@ -330,7 +332,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;
-@@ -909,10 +1001,14 @@
+@@ -909,10 +999,14 @@
}
info->swapBuffersWait = xf86ReturnOptValBool(info->Options,
@@ -346,7 +348,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;
-@@ -922,7 +1018,10 @@
+@@ -922,7 +1016,10 @@
pRADEONEnt->HasCRTC2 = FALSE;
else
pRADEONEnt->HasCRTC2 = TRUE;
@@ -358,7 +360,7 @@ 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
-@@ -1122,6 +1221,11 @@
+@@ -1122,6 +1219,11 @@
if (info->accel_state->use_vbos)
radeon_vbo_free_lists(pScrn);
@@ -370,7 +372,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
drmDropMaster(info->dri2.drm_fd);
drmmode_fini(pScrn, &info->drmmode);
-@@ -1150,6 +1254,21 @@
+@@ -1150,6 +1252,21 @@
RADEONFreeRec(pScrn);
}
@@ -392,7 +394,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
Bool RADEONScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-@@ -1157,7 +1276,7 @@
+@@ -1157,7 +1274,7 @@
int subPixelOrder = SubPixelUnknown;
char* s;
void *front_ptr;
@@ -401,7 +403,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
pScrn->fbOffset = 0;
-@@ -1168,7 +1287,8 @@
+@@ -1168,7 +1285,8 @@
pScrn->defaultVisual)) return FALSE;
miSetPixmapDepths ();
@@ -411,7 +413,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (ret) {
ErrorF("Unable to retrieve master\n");
return FALSE;
-@@ -1185,7 +1305,8 @@
+@@ -1185,7 +1303,8 @@
"failed to initialise GEM buffer manager");
return FALSE;
}
@@ -421,7 +423,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (!info->csm)
info->csm = radeon_cs_manager_gem_ctor(info->dri2.drm_fd);
-@@ -1309,7 +1430,10 @@
+@@ -1309,7 +1428,10 @@
/* Cursor setup */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
@@ -433,7 +435,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (RADEONCursorInit_KMS(pScreen)) {
}
}
-@@ -1351,6 +1475,8 @@
+@@ -1351,6 +1473,8 @@
info->CreateScreenResources = pScreen->CreateScreenResources;
pScreen->CreateScreenResources = RADEONCreateScreenResources_KMS;
@@ -442,7 +444,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
#ifdef RADEON_PIXMAP_SHARING
pScreen->StartPixmapTracking = PixmapStartDirtyTracking;
pScreen->StopPixmapTracking = PixmapStopDirtyTracking;
-@@ -1385,13 +1511,13 @@
+@@ -1385,13 +1509,13 @@
{
SCRN_INFO_PTR(arg);
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -459,7 +461,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
if (ret)
ErrorF("Unable to retrieve master\n");
info->accel_state->XInited3D = FALSE;
-@@ -1399,7 +1525,9 @@
+@@ -1399,7 +1523,9 @@
pScrn->vtSema = TRUE;
@@ -470,7 +472,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
return FALSE;
return TRUE;
-@@ -1414,7 +1542,8 @@
+@@ -1414,7 +1540,8 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"RADEONLeaveVT_KMS\n");
@@ -480,7 +482,7 @@ Date: Mon Jul 22 17:02:17 2013 +1000
xf86RotateFreeShadow(pScrn);
-@@ -1540,6 +1669,7 @@
+@@ -1540,6 +1667,7 @@
}
info->front_surface = surface;
}
Reply to: