Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6d3ba88a63ce8823011ca74b3acc4dd9557baf75
commit 6d3ba88a63ce8823011ca74b3acc4dd9557baf75 Author: crazy <[email protected]> Date: Fri Mar 17 10:31:55 2017 +0100 xf86-video-ati-7.9.0-1-x86_64 * Version bump diff --git a/source/x11/xf86-video-ati/0002-Use-DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE-RELATIVE-flag.patch b/source/x11/xf86-video-ati/0002-Use-DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE-RELATIVE-flag.patch deleted file mode 100644 index f629e3d..0000000 --- a/source/x11/xf86-video-ati/0002-Use-DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE-RELATIVE-flag.patch +++ /dev/null @@ -1,306 +0,0 @@ -From 1106b2f773ad0611c729b27f4c192a26b43ef1e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Wed, 6 Jul 2016 15:25:33 +0900 -Subject: [PATCH 02/11] Use DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags - when available - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/drmmode_display.c | 100 ++++++++++++++++++++++++++++++++++++++++++++------ - src/drmmode_display.h | 11 +++++- - src/radeon_dri2.c | 3 +- - src/radeon_kms.c | 15 ++++---- - src/radeon_present.c | 5 ++- - src/radeon_probe.h | 1 + - 6 files changed, 112 insertions(+), 23 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 070979d3..88396163 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -2301,6 +2301,71 @@ drm_wakeup_handler(pointer data, int err, pointer p) - } - } - -+static Bool drmmode_probe_page_flip_target(drmmode_ptr drmmode) -+{ -+#ifdef DRM_CAP_PAGE_FLIP_TARGET -+ uint64_t cap_value; -+ -+ return drmGetCap(drmmode->fd, DRM_CAP_PAGE_FLIP_TARGET, -+ &cap_value) == 0 && cap_value != 0; -+#else -+ return FALSE; -+#endif -+} -+ -+static int -+drmmode_page_flip(drmmode_crtc_private_ptr drmmode_crtc, uint32_t flags, -+ uintptr_t drm_queue_seq) -+{ -+ drmmode_ptr drmmode = drmmode_crtc->drmmode; -+ -+ flags |= DRM_MODE_PAGE_FLIP_EVENT; -+ return drmModePageFlip(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, -+ drmmode->fb_id, flags, (void*)drm_queue_seq); -+} -+ -+int -+drmmode_page_flip_target_absolute(RADEONEntPtr pRADEONEnt, -+ drmmode_crtc_private_ptr drmmode_crtc, -+ uint32_t flags, uintptr_t drm_queue_seq, -+ uint32_t target_msc) -+{ -+#ifdef DRM_MODE_PAGE_FLIP_TARGET -+ if (pRADEONEnt->has_page_flip_target) { -+ drmmode_ptr drmmode = drmmode_crtc->drmmode; -+ -+ flags |= DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE; -+ return drmModePageFlipTarget(drmmode->fd, -+ drmmode_crtc->mode_crtc->crtc_id, -+ drmmode->fb_id, flags, -+ (void*)drm_queue_seq, target_msc); -+ } -+#endif -+ -+ return drmmode_page_flip(drmmode_crtc, flags, drm_queue_seq); -+} -+ -+int -+drmmode_page_flip_target_relative(RADEONEntPtr pRADEONEnt, -+ drmmode_crtc_private_ptr drmmode_crtc, -+ uint32_t flags, uintptr_t drm_queue_seq, -+ uint32_t target_msc) -+{ -+#ifdef DRM_MODE_PAGE_FLIP_TARGET -+ if (pRADEONEnt->has_page_flip_target) { -+ drmmode_ptr drmmode = drmmode_crtc->drmmode; -+ -+ flags |= DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_TARGET_RELATIVE; -+ return drmModePageFlipTarget(drmmode->fd, -+ drmmode_crtc->mode_crtc->crtc_id, -+ drmmode->fb_id, flags, -+ (void*)drm_queue_seq, target_msc); -+ } -+#endif -+ -+ return drmmode_page_flip(drmmode_crtc, flags, drm_queue_seq); -+} -+ - Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) - { - RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn); -@@ -2366,6 +2431,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) - drmmode->event_context.vblank_handler = radeon_drm_queue_handler; - drmmode->event_context.page_flip_handler = radeon_drm_queue_handler; - -+ pRADEONEnt->has_page_flip_target = drmmode_probe_page_flip_target(drmmode); -+ - drmModeFreeResources(mode_res); - return TRUE; - } -@@ -2714,8 +2781,10 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - uint32_t new_front_handle, uint64_t id, void *data, - int ref_crtc_hw_id, radeon_drm_handler_proc handler, - radeon_drm_abort_proc abort, -- enum drmmode_flip_sync flip_sync) -+ enum drmmode_flip_sync flip_sync, -+ uint32_t target_msc) - { -+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - RADEONInfoPtr info = RADEONPTR(scrn); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); - xf86CrtcPtr crtc = NULL; -@@ -2724,7 +2793,7 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - unsigned int pitch; - int i; - uint32_t tiling_flags = 0; -- uint32_t flip_flags = DRM_MODE_PAGE_FLIP_EVENT; -+ uint32_t flip_flags = flip_sync == FLIP_ASYNC ? DRM_MODE_PAGE_FLIP_ASYNC : 0; - drmmode_flipdata_ptr flipdata; - uintptr_t drm_queue_seq = 0; - -@@ -2771,9 +2840,6 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - flipdata->handler = handler; - flipdata->abort = abort; - -- if (flip_sync == FLIP_ASYNC) -- flip_flags |= DRM_MODE_PAGE_FLIP_ASYNC; -- - for (i = 0; i < config->num_crtc; i++) { - crtc = config->crtc[i]; - -@@ -2799,13 +2865,21 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - goto error; - } - -- if (drmModePageFlip(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, -- drmmode->fb_id, flip_flags, -- (void*)drm_queue_seq)) { -- xf86DrvMsg(scrn->scrnIndex, X_WARNING, -- "flip queue failed: %s\n", strerror(errno)); -- goto error; -+ if (drmmode_crtc->hw_id == ref_crtc_hw_id) { -+ if (drmmode_page_flip_target_absolute(pRADEONEnt, -+ drmmode_crtc, -+ flip_flags, -+ drm_queue_seq, -+ target_msc) != 0) -+ goto flip_error; -+ } else { -+ if (drmmode_page_flip_target_relative(pRADEONEnt, -+ drmmode_crtc, -+ flip_flags, -+ drm_queue_seq, 0) != 0) -+ goto flip_error; - } -+ - drmmode_crtc->flip_pending = TRUE; - drm_queue_seq = 0; - } -@@ -2813,6 +2887,10 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - if (flipdata->flip_count > 0) - return TRUE; - -+flip_error: -+ xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed: %s\n", -+ strerror(errno)); -+ - error: - if (flipdata && flipdata->flip_count <= 1) { - drmModeRmFB(drmmode->fd, drmmode->fb_id); -diff --git a/src/drmmode_display.h b/src/drmmode_display.h -index 85bcad91..b8f553a4 100644 ---- a/src/drmmode_display.h -+++ b/src/drmmode_display.h -@@ -133,6 +133,14 @@ enum drmmode_flip_sync { - }; - - -+extern int drmmode_page_flip_target_absolute(RADEONEntPtr pRADEONEnt, -+ drmmode_crtc_private_ptr drmmode_crtc, -+ uint32_t flags, uintptr_t drm_queue_seq, -+ uint32_t target_msc); -+extern int drmmode_page_flip_target_relative(RADEONEntPtr pRADEONEnt, -+ drmmode_crtc_private_ptr drmmode_crtc, -+ uint32_t flags, uintptr_t drm_queue_seq, -+ uint32_t target_msc); - extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp); - extern void drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode); - extern void drmmode_fini(ScrnInfoPtr pScrn, drmmode_ptr drmmode); -@@ -159,7 +167,8 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - uint32_t new_front_handle, uint64_t id, void *data, - int ref_crtc_hw_id, radeon_drm_handler_proc handler, - radeon_drm_abort_proc abort, -- enum drmmode_flip_sync flip_sync); -+ enum drmmode_flip_sync flip_sync, -+ uint32_t target_msc); - int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc); - int drmmode_get_current_ust(int drm_fd, CARD64 *ust); - -diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c -index 81126706..860ff290 100644 ---- a/src/radeon_dri2.c -+++ b/src/radeon_dri2.c -@@ -678,7 +678,8 @@ radeon_dri2_schedule_flip(xf86CrtcPtr crtc, ClientPtr client, - RADEON_DRM_QUEUE_ID_DEFAULT, flip_info, - ref_crtc_hw_id, - radeon_dri2_flip_event_handler, -- radeon_dri2_flip_event_abort, FLIP_VSYNC)) { -+ radeon_dri2_flip_event_abort, FLIP_VSYNC, -+ target_msc - radeon_get_msc_delta(draw, crtc))) { - info->drmmode.dri2_flipping = TRUE; - return TRUE; - } -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index ee2becdd..2f783a02 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -755,6 +755,7 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - { - ScreenPtr screen = ent->slave_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); -+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - xf86CrtcPtr crtc = NULL; - drmmode_crtc_private_ptr drmmode_crtc = NULL; -@@ -793,9 +794,8 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - return; - } - -- if (drmModePageFlip(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, -- drmmode_crtc->scanout[scanout_id].fb_id, -- DRM_MODE_PAGE_FLIP_EVENT, (void*)drm_queue_seq)) { -+ if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, 0, -+ drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); - return; -@@ -1046,7 +1046,8 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, - xf86CrtcPtr xf86_crtc) - { - drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; -- ScrnInfoPtr scrn; -+ ScrnInfoPtr scrn = xf86_crtc->scrn; -+ RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - uintptr_t drm_queue_seq; - unsigned scanout_id; - -@@ -1057,7 +1058,6 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, - if (!radeon_scanout_do_update(xf86_crtc, scanout_id)) - return; - -- scrn = xf86_crtc->scrn; - drm_queue_seq = radeon_drm_queue_alloc(xf86_crtc, - RADEON_DRM_QUEUE_CLIENT_DEFAULT, - RADEON_DRM_QUEUE_ID_DEFAULT, -@@ -1069,9 +1069,8 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, - return; - } - -- if (drmModePageFlip(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, -- drmmode_crtc->scanout[scanout_id].fb_id, -- DRM_MODE_PAGE_FLIP_EVENT, (void*)drm_queue_seq)) { -+ if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, 0, -+ drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); - return; -diff --git a/src/radeon_present.c b/src/radeon_present.c -index 59f3c6b8..29800fec 100644 ---- a/src/radeon_present.c -+++ b/src/radeon_present.c -@@ -349,7 +349,8 @@ radeon_present_flip(RRCrtcPtr crtc, uint64_t event_id, uint64_t target_msc, - event_id, event, crtc_id, - radeon_present_flip_event, - radeon_present_flip_abort, -- sync_flip ? FLIP_VSYNC : FLIP_ASYNC); -+ sync_flip ? FLIP_VSYNC : FLIP_ASYNC, -+ target_msc); - if (!ret) - xf86DrvMsg(scrn->scrnIndex, X_ERROR, "present flip failed\n"); - else -@@ -392,7 +393,7 @@ radeon_present_unflip(ScreenPtr screen, uint64_t event_id) - - if (radeon_do_pageflip(scrn, RADEON_DRM_QUEUE_CLIENT_DEFAULT, handle, - event_id, event, -1, radeon_present_flip_event, -- radeon_present_flip_abort, FLIP_VSYNC)) -+ radeon_present_flip_abort, FLIP_VSYNC, 0)) - return; - - modeset: -diff --git a/src/radeon_probe.h b/src/radeon_probe.h -index 573d9889..bc5b53d6 100644 ---- a/src/radeon_probe.h -+++ b/src/radeon_probe.h -@@ -133,6 +133,7 @@ typedef struct { - typedef struct - { - Bool HasCRTC2; /* All cards except original Radeon */ -+ Bool has_page_flip_target; - - int fd; /* for sharing across zaphod heads */ - int fd_ref; --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0003-Enable-glamor-by-default-with-R600-and-Xorg-1.18.3.patch b/source/x11/xf86-video-ati/0003-Enable-glamor-by-default-with-R600-and-Xorg-1.18.3.patch deleted file mode 100644 index 58cab12..0000000 --- a/source/x11/xf86-video-ati/0003-Enable-glamor-by-default-with-R600-and-Xorg-1.18.3.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f11531c99fcd6473f58b4d10efaf3efd84304d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 21 Nov 2016 18:15:05 +0900 -Subject: [PATCH 03/11] Enable glamor by default with >= R600 and Xorg >= - 1.18.3 - -glamor should now perform at least as well as EXA in general, and this -allows DRI3 to be enabled by default for >= R600. - -Reviewed-by: Alex Deucher <[email protected]> ---- - man/radeon.man | 2 +- - src/radeon_glamor.c | 11 +++++++++-- - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/man/radeon.man b/man/radeon.man -index 6af7a928..8990ae21 100644 ---- a/man/radeon.man -+++ b/man/radeon.man -@@ -293,7 +293,7 @@ Chooses between available acceleration architectures. Valid values are - .B glamor - (for R300 or higher). The default is - .B glamor --as of TAHITI, otherwise -+with R600 or newer (with Xorg >= 1.18.3, otherwise with TAHITI or newer), otherwise - .B EXA. - - .PP -diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c -index b66848fc..590c9f0c 100644 ---- a/src/radeon_glamor.c -+++ b/src/radeon_glamor.c -@@ -84,8 +84,15 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) - return FALSE; - - s = xf86GetOptValString(info->Options, OPTION_ACCELMETHOD); -- if (s == NULL && info->ChipFamily < CHIP_FAMILY_TAHITI) -- return FALSE; -+ if (!s) { -+ if (xorgGetVersion() >= XORG_VERSION_NUMERIC(1,18,3,0,0)) { -+ if (info->ChipFamily < CHIP_FAMILY_R600) -+ return FALSE; -+ } else { -+ if (info->ChipFamily < CHIP_FAMILY_TAHITI) -+ return FALSE; -+ } -+ } - - if (s && strcasecmp(s, "glamor") != 0) { - if (info->ChipFamily >= CHIP_FAMILY_TAHITI) --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0004-Don-t-install-Flush-EventCallback-for-GPU-screens.patch b/source/x11/xf86-video-ati/0004-Don-t-install-Flush-EventCallback-for-GPU-screens.patch deleted file mode 100644 index 463c914..0000000 --- a/source/x11/xf86-video-ati/0004-Don-t-install-Flush-EventCallback-for-GPU-screens.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 13c6bc5e382765fe567091e1c616c0a26eec04ca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 1 Aug 2016 18:11:57 +0900 -Subject: [PATCH 04/11] Don't install Flush/EventCallback for GPU screens - -Their purpose is to flush GPU rendering commands corresponding to damage -events, but there can be no damage events corresponding to GPU screen -rendering operations. - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/radeon_kms.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index 2f783a02..a5943d1c 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -302,7 +302,7 @@ radeon_flush_callback(CallbackListPtr *list, - - static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - { -- ExtensionEntry *damage_ext = CheckExtension("DAMAGE"); -+ ExtensionEntry *damage_ext; - ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - RADEONInfoPtr info = RADEONPTR(pScrn); - PixmapPtr pixmap; -@@ -360,7 +360,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - radeon_glamor_create_screen_resources(pScreen); - - info->callback_event_type = -1; -- if (damage_ext) { -+ if (!pScreen->isGPU && (damage_ext = CheckExtension("DAMAGE"))) { - info->callback_event_type = damage_ext->eventBase + XDamageNotify; - - if (!AddCallback(&FlushCallback, radeon_flush_callback, pScrn)) --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0005-Pass-fb_id-into-drmmode_page_flip_target_absolute-re.patch b/source/x11/xf86-video-ati/0005-Pass-fb_id-into-drmmode_page_flip_target_absolute-re.patch deleted file mode 100644 index d28b316..0000000 --- a/source/x11/xf86-video-ati/0005-Pass-fb_id-into-drmmode_page_flip_target_absolute-re.patch +++ /dev/null @@ -1,160 +0,0 @@ -From 5fea5ef2f07eee4a0f94baab427010b936f1d4b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Thu, 24 Nov 2016 18:45:22 +0900 -Subject: [PATCH 05/11] Pass fb_id into - drmmode_page_flip_target_absolute/relative - -drmmode->fb_id isn't what we need in the TearFree case. Fixes TearFree -freezing with - -(WW) RADEON(0): flip queue failed in radeon_scanout_flip: No such file or directory - -in the log file. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98834 -Fixes: 1106b2f773ad ("Use DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags when available") ---- - src/drmmode_display.c | 28 +++++++++++++++------------- - src/drmmode_display.h | 6 ++++-- - src/radeon_kms.c | 10 ++++++---- - 3 files changed, 25 insertions(+), 19 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 88396163..f856f67b 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -2314,21 +2314,21 @@ static Bool drmmode_probe_page_flip_target(drmmode_ptr drmmode) - } - - static int --drmmode_page_flip(drmmode_crtc_private_ptr drmmode_crtc, uint32_t flags, -- uintptr_t drm_queue_seq) -+drmmode_page_flip(drmmode_crtc_private_ptr drmmode_crtc, int fb_id, -+ uint32_t flags, uintptr_t drm_queue_seq) - { - drmmode_ptr drmmode = drmmode_crtc->drmmode; - - flags |= DRM_MODE_PAGE_FLIP_EVENT; - return drmModePageFlip(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, -- drmmode->fb_id, flags, (void*)drm_queue_seq); -+ fb_id, flags, (void*)drm_queue_seq); - } - - int - drmmode_page_flip_target_absolute(RADEONEntPtr pRADEONEnt, - drmmode_crtc_private_ptr drmmode_crtc, -- uint32_t flags, uintptr_t drm_queue_seq, -- uint32_t target_msc) -+ int fb_id, uint32_t flags, -+ uintptr_t drm_queue_seq, uint32_t target_msc) - { - #ifdef DRM_MODE_PAGE_FLIP_TARGET - if (pRADEONEnt->has_page_flip_target) { -@@ -2337,19 +2337,19 @@ drmmode_page_flip_target_absolute(RADEONEntPtr pRADEONEnt, - flags |= DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE; - return drmModePageFlipTarget(drmmode->fd, - drmmode_crtc->mode_crtc->crtc_id, -- drmmode->fb_id, flags, -- (void*)drm_queue_seq, target_msc); -+ fb_id, flags, (void*)drm_queue_seq, -+ target_msc); - } - #endif - -- return drmmode_page_flip(drmmode_crtc, flags, drm_queue_seq); -+ return drmmode_page_flip(drmmode_crtc, fb_id, flags, drm_queue_seq); - } - - int - drmmode_page_flip_target_relative(RADEONEntPtr pRADEONEnt, - drmmode_crtc_private_ptr drmmode_crtc, -- uint32_t flags, uintptr_t drm_queue_seq, -- uint32_t target_msc) -+ int fb_id, uint32_t flags, -+ uintptr_t drm_queue_seq, uint32_t target_msc) - { - #ifdef DRM_MODE_PAGE_FLIP_TARGET - if (pRADEONEnt->has_page_flip_target) { -@@ -2358,12 +2358,12 @@ drmmode_page_flip_target_relative(RADEONEntPtr pRADEONEnt, - flags |= DRM_MODE_PAGE_FLIP_EVENT | DRM_MODE_PAGE_FLIP_TARGET_RELATIVE; - return drmModePageFlipTarget(drmmode->fd, - drmmode_crtc->mode_crtc->crtc_id, -- drmmode->fb_id, flags, -- (void*)drm_queue_seq, target_msc); -+ fb_id, flags, (void*)drm_queue_seq, -+ target_msc); - } - #endif - -- return drmmode_page_flip(drmmode_crtc, flags, drm_queue_seq); -+ return drmmode_page_flip(drmmode_crtc, fb_id, flags, drm_queue_seq); - } - - Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) -@@ -2868,6 +2868,7 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - if (drmmode_crtc->hw_id == ref_crtc_hw_id) { - if (drmmode_page_flip_target_absolute(pRADEONEnt, - drmmode_crtc, -+ drmmode->fb_id, - flip_flags, - drm_queue_seq, - target_msc) != 0) -@@ -2875,6 +2876,7 @@ Bool radeon_do_pageflip(ScrnInfoPtr scrn, ClientPtr client, - } else { - if (drmmode_page_flip_target_relative(pRADEONEnt, - drmmode_crtc, -+ drmmode->fb_id, - flip_flags, - drm_queue_seq, 0) != 0) - goto flip_error; -diff --git a/src/drmmode_display.h b/src/drmmode_display.h -index b8f553a4..6bbf71c1 100644 ---- a/src/drmmode_display.h -+++ b/src/drmmode_display.h -@@ -135,11 +135,13 @@ enum drmmode_flip_sync { - - extern int drmmode_page_flip_target_absolute(RADEONEntPtr pRADEONEnt, - drmmode_crtc_private_ptr drmmode_crtc, -- uint32_t flags, uintptr_t drm_queue_seq, -+ int fb_id, uint32_t flags, -+ uintptr_t drm_queue_seq, - uint32_t target_msc); - extern int drmmode_page_flip_target_relative(RADEONEntPtr pRADEONEnt, - drmmode_crtc_private_ptr drmmode_crtc, -- uint32_t flags, uintptr_t drm_queue_seq, -+ int fb_id, uint32_t flags, -+ uintptr_t drm_queue_seq, - uint32_t target_msc); - extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp); - extern void drmmode_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode); -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index a5943d1c..dcf41578 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -794,8 +794,9 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - return; - } - -- if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, 0, -- drm_queue_seq, 0) != 0) { -+ if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, -+ drmmode_crtc->scanout[scanout_id].fb_id, -+ 0, drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); - return; -@@ -1069,8 +1070,9 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, - return; - } - -- if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, 0, -- drm_queue_seq, 0) != 0) { -+ if (drmmode_page_flip_target_relative(pRADEONEnt, drmmode_crtc, -+ drmmode_crtc->scanout[scanout_id].fb_id, -+ 0, drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); - return; --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0006-fix-build-for-xserver-1.13.patch b/source/x11/xf86-video-ati/0006-fix-build-for-xserver-1.13.patch deleted file mode 100644 index 6824e37..0000000 --- a/source/x11/xf86-video-ati/0006-fix-build-for-xserver-1.13.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 487aa62a2a23b86e4ea4714fdfd465c9e513141f Mon Sep 17 00:00:00 2001 -From: Jochen Rollwagen <[email protected]> -Date: Thu, 24 Nov 2016 18:44:01 +0100 -Subject: [PATCH 06/11] fix build for xserver < 1.13 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -same procedure every few patches..... - -Fixes: 13c6bc5e3827 ("Don't install Flush/EventCallback for GPU screens") -Reviewed-by: Michel Dänzer <[email protected]> ---- - src/radeon_kms.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index dcf41578..d0a474e0 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -360,7 +360,11 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - radeon_glamor_create_screen_resources(pScreen); - - info->callback_event_type = -1; -- if (!pScreen->isGPU && (damage_ext = CheckExtension("DAMAGE"))) { -+ if ( -+#ifdef RADEON_PIXMAP_SHARING -+ !pScreen->isGPU && -+#endif -+ (damage_ext = CheckExtension("DAMAGE"))) { - info->callback_event_type = damage_ext->eventBase + XDamageNotify; - - if (!AddCallback(&FlushCallback, radeon_flush_callback, pScrn)) --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0007-Add-radeon_is_gpu_screen-helper.patch b/source/x11/xf86-video-ati/0007-Add-radeon_is_gpu_screen-helper.patch deleted file mode 100644 index a032967..0000000 --- a/source/x11/xf86-video-ati/0007-Add-radeon_is_gpu_screen-helper.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f130b10e63f7526360b41aa0918b4940f63f662a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Fri, 25 Nov 2016 18:12:40 +0900 -Subject: [PATCH 07/11] Add radeon_is_gpu_screen helper - -This will hopefully decrease the chance of accidentally breaking the -build against xserver < 1.13 in the future. - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/drmmode_display.c | 5 +---- - src/radeon.h | 3 +++ - src/radeon_kms.c | 14 +++----------- - 3 files changed, 7 insertions(+), 15 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index f856f67b..95e3acdc 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -779,10 +779,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - fb_id = drmmode_crtc->rotate.fb_id; - x = y = 0; - -- } else if ( --#ifdef RADEON_PIXMAP_SHARING -- !pScreen->isGPU && --#endif -+ } else if (!radeon_is_gpu_screen(pScreen) && - (info->tear_free || - #if XF86_CRTC_VERSION >= 4 - crtc->driverIsPerformingTransform || -diff --git a/src/radeon.h b/src/radeon.h -index ad7e69cc..8ca8d318 100644 ---- a/src/radeon.h -+++ b/src/radeon.h -@@ -182,6 +182,9 @@ typedef enum { - - #if XF86_CRTC_VERSION >= 5 - #define RADEON_PIXMAP_SHARING 1 -+#define radeon_is_gpu_screen(screen) (screen)->isGPU -+#else -+#define radeon_is_gpu_screen(screen) 0 - #endif - - #define RADEON_VSYNC_TIMEOUT 20000 /* Maximum wait for VSYNC (in usecs) */ -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index d0a474e0..6281fa50 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -317,10 +317,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - if (dixPrivateKeyRegistered(rrPrivKey)) { - rrScrPrivPtr rrScrPriv = rrGetScrPriv(pScreen); - -- if ( --#ifdef RADEON_PIXMAP_SHARING -- !pScreen->isGPU && --#endif -+ if (!radeon_is_gpu_screen(pScreen) && - !rrScrPriv->primaryOutput) - { - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); -@@ -360,10 +357,7 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - radeon_glamor_create_screen_resources(pScreen); - - info->callback_event_type = -1; -- if ( --#ifdef RADEON_PIXMAP_SHARING -- !pScreen->isGPU && --#endif -+ if (!radeon_is_gpu_screen(pScreen) && - (damage_ext = CheckExtension("DAMAGE"))) { - info->callback_event_type = damage_ext->eventBase + XDamageNotify; - -@@ -1099,9 +1093,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) - (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); - pScreen->BlockHandler = RADEONBlockHandler_KMS; - --#ifdef RADEON_PIXMAP_SHARING -- if (!pScreen->isGPU) --#endif -+ if (!radeon_is_gpu_screen(pScreen)) - { - for (c = 0; c < xf86_config->num_crtc; c++) { - if (info->tear_free) --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0008-Take-current-scanout_id-into-account-everywhere-invo.patch b/source/x11/xf86-video-ati/0008-Take-current-scanout_id-into-account-everywhere-invo.patch deleted file mode 100644 index 1f2d3dc..0000000 --- a/source/x11/xf86-video-ati/0008-Take-current-scanout_id-into-account-everywhere-invo.patch +++ /dev/null @@ -1,143 +0,0 @@ -From e543ef3a2fb304cbe3a965fb780632af2e4186f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 21 Nov 2016 18:33:25 +0900 -Subject: [PATCH 08/11] Take current scanout_id into account everywhere - involved with TearFree - -Fixes various potential issues with TearFree enabled, e.g. outputs -freezing after display configuration changes. - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/drmmode_display.c | 22 +++++++++++----------- - src/radeon.h | 3 +-- - src/radeon_kms.c | 6 +++--- - 3 files changed, 15 insertions(+), 16 deletions(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 95e3acdc..e02a6f5c 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -722,6 +722,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - RADEONInfoPtr info = RADEONPTR(pScrn); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); - drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; -+ unsigned scanout_id = drmmode_crtc->scanout_id ^ info->tear_free; - drmmode_ptr drmmode = drmmode_crtc->drmmode; - int saved_x, saved_y; - Rotation saved_rotation; -@@ -771,7 +772,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - fb_id = drmmode->fb_id; - #ifdef RADEON_PIXMAP_SHARING - if (crtc->randr_crtc && crtc->randr_crtc->scanout_pixmap) { -- fb_id = drmmode_crtc->scanout[0].fb_id; -+ fb_id = drmmode_crtc->scanout[scanout_id].fb_id; - x = y = 0; - } else - #endif -@@ -815,12 +816,11 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, - pBox->x2 = max(pBox->x2, pScrn->virtualX); - pBox->y2 = max(pBox->y2, pScrn->virtualY); - -- drmmode_crtc->scanout_id = 0; -- fb_id = drmmode_crtc->scanout[0].fb_id; -+ fb_id = drmmode_crtc->scanout[scanout_id].fb_id; - x = y = 0; - -- radeon_scanout_update_handler(crtc, 0, 0, drmmode_crtc); -- radeon_bo_wait(drmmode_crtc->scanout[0].bo); -+ radeon_scanout_do_update(crtc, scanout_id); -+ radeon_bo_wait(drmmode_crtc->scanout[scanout_id].bo); - } - } - -@@ -897,7 +897,7 @@ done: - } else { - crtc->active = TRUE; - -- if (fb_id != drmmode_crtc->scanout[0].fb_id) -+ if (fb_id != drmmode_crtc->scanout[scanout_id].fb_id) - drmmode_crtc_scanout_free(drmmode_crtc); - } - -@@ -1134,13 +1134,13 @@ static Bool - drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) - { - drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; -+ unsigned scanout_id = drmmode_crtc->scanout_id; - RADEONInfoPtr info = RADEONPTR(crtc->scrn); - ScreenPtr screen = crtc->scrn->pScreen; - PixmapDirtyUpdatePtr dirty; - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { -- if (dirty->slave_dst != -- drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap) -+ if (dirty->slave_dst != drmmode_crtc->scanout[scanout_id].pixmap) - continue; - - PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); -@@ -1165,13 +1165,13 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) - } - - #ifdef HAS_DIRTYTRACKING_ROTATION -- PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[0].pixmap, -+ PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[scanout_id].pixmap, - 0, 0, 0, 0, RR_Rotate_0); - #elif defined(HAS_DIRTYTRACKING2) -- PixmapStartDirtyTracking2(ppix, drmmode_crtc->scanout[0].pixmap, -+ PixmapStartDirtyTracking2(ppix, drmmode_crtc->scanout[scanout_id].pixmap, - 0, 0, 0, 0); - #else -- PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[0].pixmap, 0, 0); -+ PixmapStartDirtyTracking(ppix, drmmode_crtc->scanout[scanout_id].pixmap, 0, 0); - #endif - return TRUE; - } -diff --git a/src/radeon.h b/src/radeon.h -index 8ca8d318..5797beda 100644 ---- a/src/radeon.h -+++ b/src/radeon.h -@@ -630,8 +630,7 @@ extern Bool RADEONGetPixmapOffsetPitch(PixmapPtr pPix, - Bool radeon_dri3_screen_init(ScreenPtr screen); - - /* radeon_kms.c */ --void radeon_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, -- uint64_t usec, void *event_data); -+Bool radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id); - - /* radeon_present.c */ - Bool radeon_present_screen_init(ScreenPtr screen); -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index 6281fa50..090ea3fc 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -676,7 +676,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) - return ret; - } - --void -+static void - radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t usec, - void *event_data) - { -@@ -850,7 +850,7 @@ radeon_dirty_update(ScrnInfoPtr scrn) - } - #endif - --static Bool -+Bool - radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id) - { - drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; -@@ -963,7 +963,7 @@ radeon_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) - drmmode_crtc->scanout_update_pending = FALSE; - } - --void -+static void - radeon_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t usec, - void *event_data) - { --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0009-Fix-radeon_scanout_extents_intersect-for-GPU-screens.patch b/source/x11/xf86-video-ati/0009-Fix-radeon_scanout_extents_intersect-for-GPU-screens.patch deleted file mode 100644 index ef02a6d..0000000 --- a/source/x11/xf86-video-ati/0009-Fix-radeon_scanout_extents_intersect-for-GPU-screens.patch +++ /dev/null @@ -1,47 +0,0 @@ -From a995f5830916a0fee5126263d1bfe48632be3a15 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 21 Nov 2016 18:39:00 +0900 -Subject: [PATCH 09/11] Fix radeon_scanout_extents_intersect for GPU screens - -Fixes incorrect screen updates with TearFree enabled on PRIME slave -outputs which are not located at (0, 0). - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/radeon_kms.c | 20 +++++++++++++++----- - 1 file changed, 15 insertions(+), 5 deletions(-) - -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index 090ea3fc..8bb261e2 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -383,11 +383,21 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) - static Bool - radeon_scanout_extents_intersect(xf86CrtcPtr xf86_crtc, BoxPtr extents) - { -- extents->x1 -= xf86_crtc->filter_width >> 1; -- extents->x2 += xf86_crtc->filter_width >> 1; -- extents->y1 -= xf86_crtc->filter_height >> 1; -- extents->y2 += xf86_crtc->filter_height >> 1; -- pixman_f_transform_bounds(&xf86_crtc->f_framebuffer_to_crtc, extents); -+#ifdef RADEON_PIXMAP_SHARING -+ if (xf86_crtc->scrn->is_gpu) { -+ extents->x1 -= xf86_crtc->x; -+ extents->y1 -= xf86_crtc->y; -+ extents->x2 -= xf86_crtc->x; -+ extents->y2 -= xf86_crtc->y; -+ } else -+#endif -+ { -+ extents->x1 -= xf86_crtc->filter_width >> 1; -+ extents->x2 += xf86_crtc->filter_width >> 1; -+ extents->y1 -= xf86_crtc->filter_height >> 1; -+ extents->y2 += xf86_crtc->filter_height >> 1; -+ pixman_f_transform_bounds(&xf86_crtc->f_framebuffer_to_crtc, extents); -+ } - - extents->x1 = max(extents->x1, 0); - extents->y1 = max(extents->y1, 0); --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0010-Call-ValidateGC-after-ChangeClip-in-radeon_sync_scan.patch b/source/x11/xf86-video-ati/0010-Call-ValidateGC-after-ChangeClip-in-radeon_sync_scan.patch deleted file mode 100644 index 340fbed..0000000 --- a/source/x11/xf86-video-ati/0010-Call-ValidateGC-after-ChangeClip-in-radeon_sync_scan.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 14c3f59f5157885ad8f941f0bad6c0c5e3db12f8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 21 Nov 2016 18:45:30 +0900 -Subject: [PATCH 10/11] Call ValidateGC after ChangeClip in - radeon_sync_scanout_pixmaps - -The wrong order meant that the clipping region wasn't actually applied, -so it always copied the full contents from the other scanout pixmap. - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/radeon_kms.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index 8bb261e2..5764c20c 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -495,8 +495,8 @@ radeon_sync_scanout_pixmaps(xf86CrtcPtr xf86_crtc, RegionPtr new_region, - - gc = GetScratchGC(dst->depth, pScreen); - if (gc) { -- ValidateGC(dst, gc); - gc->funcs->ChangeClip(gc, CT_REGION, sync_region, 0); -+ ValidateGC(dst, gc); - sync_region = NULL; - gc->ops->CopyArea(src, dst, gc, 0, 0, dst->width, dst->height, 0, 0); - FreeScratchGC(gc); --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/0011-Call-radeon_drm_abort_entry-on-failure-to-flip-to-a-.patch b/source/x11/xf86-video-ati/0011-Call-radeon_drm_abort_entry-on-failure-to-flip-to-a-.patch deleted file mode 100644 index 343d0b5..0000000 --- a/source/x11/xf86-video-ati/0011-Call-radeon_drm_abort_entry-on-failure-to-flip-to-a-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e2942449171fe628a7726e59bcaab65e27d88563 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]> -Date: Mon, 21 Nov 2016 18:47:53 +0900 -Subject: [PATCH 11/11] Call radeon_drm_abort_entry on failure to flip to a - scanout pixmap - -Fixes leaking the corresponding struct radeon_drm_queue list entry in -that case. - -Reviewed-by: Alex Deucher <[email protected]> ---- - src/radeon_kms.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index 5764c20c..48dec967 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -807,6 +807,7 @@ radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - 0, drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); -+ radeon_drm_abort_entry(drm_queue_seq); - return; - } - -@@ -1083,6 +1084,7 @@ radeon_scanout_flip(ScreenPtr pScreen, RADEONInfoPtr info, - 0, drm_queue_seq, 0) != 0) { - xf86DrvMsg(scrn->scrnIndex, X_WARNING, "flip queue failed in %s: %s\n", - __func__, strerror(errno)); -+ radeon_drm_abort_entry(drm_queue_seq); - return; - } - --- -2.11.0 - diff --git a/source/x11/xf86-video-ati/FrugalBuild b/source/x11/xf86-video-ati/FrugalBuild index fd1c165..92411c1 100644 --- a/source/x11/xf86-video-ati/FrugalBuild +++ b/source/x11/xf86-video-ati/FrugalBuild @@ -5,38 +5,16 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=xf86-video-ati -pkgver=7.8.0 +pkgver=7.9.0 Fuse $USE_DEVEL && pkgver=6.15.gb5cf9bd -pkgrel=2 +pkgrel=1 pkgdesc="X.Org driver for ATI cards" url="http://xorg.freedesktop.org" groups=('x11' 'xorg-core' 'xorg-drivers') archs=('i686' 'x86_64') depends=('xorg-server>=1.18.4-5') Finclude xorg -## remove all these for 7.8.1++ -source+=(0002-Use-DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE-RELATIVE-flag.patch \ - 0003-Enable-glamor-by-default-with-R600-and-Xorg-1.18.3.patch \ - 0004-Don-t-install-Flush-EventCallback-for-GPU-screens.patch \ - 0005-Pass-fb_id-into-drmmode_page_flip_target_absolute-re.patch \ - 0006-fix-build-for-xserver-1.13.patch \ - 0007-Add-radeon_is_gpu_screen-helper.patch \ - 0008-Take-current-scanout_id-into-account-everywhere-invo.patch \ - 0009-Fix-radeon_scanout_extents_intersect-for-GPU-screens.patch \ - 0010-Call-ValidateGC-after-ChangeClip-in-radeon_sync_scan.patch \ - 0011-Call-radeon_drm_abort_entry-on-failure-to-flip-to-a-.patch) - -sha1sums=('30c4470d1252eade1d5c5998e42b66b0ac80a638' \ - 'eb297050b44287c447723151e16913404522988c' \ - 'e6324b46f0acb3358a08114d5b197ea5630543d7' \ - '2cb9673b10388ec503fab0e699ae7d4be356bf3b' \ - '05951c1cc40b2c3e827d1fb987aec9239c33c367' \ - '5921a6d2ae14c4128b131d44e053ea3106b9a8df' \ - 'bd34d4d5e8f37ff6927109ddda96941e6bbe435b' \ - 'f5dd96cb14767b4e96c5184bf0810c8daca4c9a4' \ - '3666b88593e516311f81bcbfd6578be8b7dfb075' \ - 'dc411fb669f1073cd7b656eca2b262e171916114' \ - 'e1fd9e0e853e59bfc36c5d0dd0ca54c066574b71') +sha1sums=('86ee6db1d7dcdeb1948aeb7965be8102c18be46b') replaces=('xf86-video-radeonhd') conflicts=('xf86-video-radeonhd')
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
