Accepting request 344171 from home:boombatower:branches:X11:XOrg
- Update to version 7.6.1: + Post 7.6.0 release version bump + Remove duplicate free(output_ids) call + Set version for 7.6.1 release - Update to version 7.6.0: + Remove dead accelDFS flag + radeon: bump version post release + add new bonaire pci id + add new OLAND pci id + radeon: stop caching mode resources + radeon: move output name creation to its own function + radeon: add support for DP 1.2 display hotplug (v2) + radeon: adopt for new X server dirty tracking APIs. + radeon: cleanup the entity rec + radeon: move radeon_pixmap forward declaration into other block + radeon/vdpau: don't report VDPAU for < r300 + Handle tiling in radeon_set_shared_pixmap_backing + Do not link radeon_drv.so against libpciaccess + Avoid leaking memory on output. + Proper leak fix, previous leak fix was bogus. + present: Move check for async flips + present: Fix present notify timestamps and counts. + Allow/Fix use of multiple ZaphodHead outputs per x-screen. (v2) + Don't set TILE_SPLIT flags if surface.tile_split == 0. + Fix inconsistent default eg_tile_split in evergreen_accel.c + Make selection between DRI2 and DRI3 consistent with other drivers. (v2) + Remove duplicate OPTION_PAGE_FLIP entry + PRIME: Don't advertise offload capabilities when acceleration is disabled + Prefer drmModeSetCursor2 over drmModeSetCursor + Require at least xserver 1.8 + Move xorg_list backwards compatibility to new radeon_list.h header + Add DRM event queue helpers v2 + DRI2: Simplify blit fallback handling for scheduled swaps + DRI2: Remove superfluous assignments to *_info->frame + DRI2: Move radeon_dri2_flip_event_handler + DRI2: Use helper functions for DRM event queue management v3 + DRI2: Split out helper for getting UST and MSC of a specific CRTC + Move #include "radeon_glamor.h" from radeon.h to where it's needed + Fold radeon_glamor_flush into radeon_cs_flush_indirect + Add support for SYNC extension fences v2 + Add support for the Present extension v2 + Add DRI3 support v2 + Simplify includes in radeon_{dri3,present}.c + Add xorg_list_for_each_entry_safe fallback in radeon_list.h + Initialize boolean variable before calling xf86GetOptValBool + DRI3: Use open hook instead of open_client + Always include misync.h before other misync headers + glamor: Add glamor_fd_from_pixmap define for standalone glamor tree + dri3: Use screen->CreatePixmap instead of fbCreatePixmap directly + EXA: Return NULL from radeon_get_pixmap_bo if there is no driver private + configure.ac: Check for misyncshm.h again + Adapt radeon_sync.c for misyncshm.h vs misync.h as well + Make radeon_do_pageflip take a BO handle directly + Present: Add radeon_present_get_pixmap_handle helper + glamor: Avoid generating GEM flink names for BOs shared via DRI3 v2 + glamor: Handle GLAMOR_* flags removed from xserver + Increase robustness against DRM page flip ioctl failures v3 + Simplify radeon_do_pageflip() error handling slightly more + Move radeon_drm_handler/abort_proc fields to drmmode_flipdata_rec + Move get_pixmap_handle helper to radeon_bo_helper.c + DRI2: Use radeon_get_pixmap_handle + Only enable SYNC extension fences and the Present extension along with DRI3 + Add radeon_get_pixmap_tiling_flags helper + present: Don't flip between BOs with different tiling parameters + Rename scanout_pixmap_x field to prime_pixmap_x + Split out struct drmmode_scanout for rotation shadow buffer information + Add RADEON_CREATE_PIXMAP_SCANOUT flag + glamor: Remove unused function radeon_glamor_pixmap_is_offscreen + glamor: Add radeon_pixmap parameter to radeon_glamor_create_textured_pixmap + glamor: Add wrappers for the X server rendering hooks + glamor: Add Option "ShadowPrimary" v2 + glamor: Remove the stride member of struct radeon_pixmap + Add Option "TearFree" v4 + DRI2: Clear old->devPrivate.ptr in fixup_glamor + Only copy fbcon BO contents if bgNoneRoot is TRUE + Defer initial drmmode_copy_fb call until root window creation + Defer initial modeset until the first BlockHandler invocation + Update scanout pixmap contents before setting a mode with it + Make drmmode_copy_fb() work with glamor as well + On screen resize, clear the new buffer before displaying it + Don't call radeon_get_pixmap_private() when using EXA + Skip disabled CRTCs in drmmode_set_desired_modes() even if set_hw == FALSE + glamor: Deal with glamor_glyphs_init being removed from xserver + Replace SyncFence typedef with declaration of struct _SyncFence + present: Remove get_drmmode_crtc helper + glamor: Only wait for GPU writes in radeon_glamor_prepare_access_cpu_ro + DRI2: Fix handling of drmmode_crtc_get_ust_msc return code + Don't attempt a DRI2/Present page flip while the other one is flipping + Skip disabled CRTCs in radeon_scanout_(do_)update + present: Fall back to modeset for unflip operation + present: Look at all CRTCs to determine if we can flip + present: Handle DPMS off in radeon_present_get_ust_msc + Remove unused local variable pRADEONEnt + glamor: Move declaration of struct radeon_pixmap out of #if/#else blocks + Only call drmmode_copy_fb (at most) once on server startup + Wait for scanout BO initialization to finish before setting mode + DRI2: Don't ignore rotated CRTCs in amdgpu_dri2_drawable_crtc + DRI2: Keep MSC monotonic when moving window between CRTCs + Only align screen / scanout pixmap height where necessary + Call xf86CrtcRotate from initial drmmode_set_desired_modes call + Don't advertise rotation support without hardware acceleration v2 + Eliminate redundant data parameter from drmmode_crtc_scanout_create + Properly handle drmModeAddFB failure in drmmode_crtc_scanout_allocate + Bump version for 7.6.0 release + Disable CRTCs when disabling the outputs + Do not try to enable already enabled CRTCs in DPMS hook + radeon: remove unneeded inclusion of sarea.h + Handle failures in setting a CRTC to a DRM mode properly + dri2: Avoid calculation with undefined msc value + Simplify pick best crtc to fold two loops into one + Clean up allocation in RADEONInitVideo() + Simplify drmmode_set_mode_major() and avoid leaking memory. + Clean up radeon_dri2_create_buffer2() - Remove upstream patches: * U_glamor-Handle-GLAMOR_-flags-removed-from-xserver.patch * U_radeon-adopt-for-new-X-server-dirty-tracking-APIs.patch OBS-URL: https://build.opensuse.org/request/show/344171 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=44
This commit is contained in:
parent
f11fa00ed0
commit
9f28aa4280
@ -1,53 +0,0 @@
|
||||
From b16609b453bb1a181198cf27778f205dc23fb642 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
|
||||
Date: Thu, 26 Mar 2015 17:15:21 +0900
|
||||
Subject: [PATCH] glamor: Handle GLAMOR_* flags removed from xserver
|
||||
|
||||
The behaviour is the same as when the removed flags were passed in.
|
||||
|
||||
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
||||
---
|
||||
src/radeon_glamor.c | 8 +++-----
|
||||
src/radeon_glamor.h | 11 +++++++++++
|
||||
2 files changed, 14 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: xf86-video-ati-7.5.0/src/radeon_glamor.c
|
||||
===================================================================
|
||||
--- xf86-video-ati-7.5.0.orig/src/radeon_glamor.c
|
||||
+++ xf86-video-ati-7.5.0/src/radeon_glamor.c
|
||||
@@ -329,11 +329,9 @@ radeon_glamor_init(ScreenPtr screen)
|
||||
{
|
||||
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
|
||||
|
||||
- if (!glamor_init(screen, GLAMOR_INVERTED_Y_AXIS | GLAMOR_USE_EGL_SCREEN |
|
||||
-#ifdef GLAMOR_NO_DRI3
|
||||
- GLAMOR_NO_DRI3 |
|
||||
-#endif
|
||||
- GLAMOR_USE_SCREEN | GLAMOR_USE_PICTURE_SCREEN)) {
|
||||
+ if (!glamor_init(screen, GLAMOR_USE_EGL_SCREEN | GLAMOR_USE_SCREEN |
|
||||
+ GLAMOR_USE_PICTURE_SCREEN | GLAMOR_INVERTED_Y_AXIS |
|
||||
+ GLAMOR_NO_DRI3)) {
|
||||
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
|
||||
"Failed to initialize glamor.\n");
|
||||
return FALSE;
|
||||
Index: xf86-video-ati-7.5.0/src/radeon_glamor.h
|
||||
===================================================================
|
||||
--- xf86-video-ati-7.5.0.orig/src/radeon_glamor.h
|
||||
+++ xf86-video-ati-7.5.0/src/radeon_glamor.h
|
||||
@@ -32,6 +32,16 @@
|
||||
|
||||
#include "radeon_surface.h"
|
||||
|
||||
+#ifndef GLAMOR_INVERTED_Y_AXIS
|
||||
+#define GLAMOR_INVERTED_Y_AXIS 0
|
||||
+#endif
|
||||
+#ifndef GLAMOR_USE_SCREEN
|
||||
+#define GLAMOR_USE_SCREEN 0
|
||||
+#endif
|
||||
+#ifndef GLAMOR_USE_PICTURE_SCREEN
|
||||
+#define GLAMOR_USE_PICTURE_SCREEN 0
|
||||
+#endif
|
||||
+
|
||||
Bool radeon_glamor_pre_init(ScrnInfoPtr scrn);
|
||||
Bool radeon_glamor_init(ScreenPtr screen);
|
||||
Bool radeon_glamor_create_screen_resources(ScreenPtr screen);
|
@ -1,42 +0,0 @@
|
||||
From b6d871bf299c7d0f106c07ee4d8bd3b2337f53cc Mon Sep 17 00:00:00 2001
|
||||
From: Dave Airlie <airlied@gmail.com>
|
||||
Date: Thu, 9 Jul 2015 19:25:36 +1000
|
||||
Subject: [PATCH] radeon: adopt for new X server dirty tracking APIs.
|
||||
|
||||
Signed-off-by: Dave Airlie <airlied@redhat.com>
|
||||
---
|
||||
src/drmmode_display.c | 4 +++-
|
||||
src/radeon_kms.c | 4 ++++
|
||||
2 files changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: xf86-video-ati-7.5.0/src/drmmode_display.c
|
||||
===================================================================
|
||||
--- xf86-video-ati-7.5.0.orig/src/drmmode_display.c
|
||||
+++ xf86-video-ati-7.5.0/src/drmmode_display.c
|
||||
@@ -794,7 +794,9 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr c
|
||||
screen->height = screenpix->drawable.height = max_height;
|
||||
}
|
||||
drmmode_crtc->scanout_pixmap_x = this_x;
|
||||
-#ifdef HAS_DIRTYTRACKING2
|
||||
+#ifdef HAS_DIRTYTRACKING_ROTATION
|
||||
+ PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
|
||||
+#elif defined(HAS_DIRTYTRACKING2)
|
||||
PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
|
||||
#else
|
||||
PixmapStartDirtyTracking(ppix, screenpix, 0, 0);
|
||||
Index: xf86-video-ati-7.5.0/src/radeon_kms.c
|
||||
===================================================================
|
||||
--- xf86-video-ati-7.5.0.orig/src/radeon_kms.c
|
||||
+++ xf86-video-ati-7.5.0/src/radeon_kms.c
|
||||
@@ -269,7 +269,11 @@ redisplay_dirty(ScreenPtr screen, Pixmap
|
||||
|
||||
PixmapRegionInit(&pixregion, dirty->slave_dst);
|
||||
DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
|
||||
+#ifdef HAS_DIRTYTRACKING_ROTATION
|
||||
+ PixmapSyncDirtyHelper(dirty);
|
||||
+#else
|
||||
PixmapSyncDirtyHelper(dirty, &pixregion);
|
||||
+#endif
|
||||
|
||||
radeon_cs_flush_indirect(pScrn);
|
||||
DamageRegionProcessPending(&dirty->slave_dst->drawable);
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
|
||||
size 809756
|
3
xf86-video-ati-7.6.1.tar.bz2
Normal file
3
xf86-video-ati-7.6.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2516d9eeb8da8bcd3a01365ed1314919777910fa904ab268af342b5693e1d34c
|
||||
size 823043
|
@ -1,3 +1,123 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 13 09:13:35 UTC 2015 - jimmy@boombatower.com
|
||||
|
||||
- Update to version 7.6.1:
|
||||
+ Post 7.6.0 release version bump
|
||||
+ Remove duplicate free(output_ids) call
|
||||
+ Set version for 7.6.1 release
|
||||
- Update to version 7.6.0:
|
||||
+ Remove dead accelDFS flag
|
||||
+ radeon: bump version post release
|
||||
+ add new bonaire pci id
|
||||
+ add new OLAND pci id
|
||||
+ radeon: stop caching mode resources
|
||||
+ radeon: move output name creation to its own function
|
||||
+ radeon: add support for DP 1.2 display hotplug (v2)
|
||||
+ radeon: adopt for new X server dirty tracking APIs.
|
||||
+ radeon: cleanup the entity rec
|
||||
+ radeon: move radeon_pixmap forward declaration into other block
|
||||
+ radeon/vdpau: don't report VDPAU for < r300
|
||||
+ Handle tiling in radeon_set_shared_pixmap_backing
|
||||
+ Do not link radeon_drv.so against libpciaccess
|
||||
+ Avoid leaking memory on output.
|
||||
+ Proper leak fix, previous leak fix was bogus.
|
||||
+ present: Move check for async flips
|
||||
+ present: Fix present notify timestamps and counts.
|
||||
+ Allow/Fix use of multiple ZaphodHead outputs per x-screen. (v2)
|
||||
+ Don't set TILE_SPLIT flags if surface.tile_split == 0.
|
||||
+ Fix inconsistent default eg_tile_split in evergreen_accel.c
|
||||
+ Make selection between DRI2 and DRI3 consistent with other drivers. (v2)
|
||||
+ Remove duplicate OPTION_PAGE_FLIP entry
|
||||
+ PRIME: Don't advertise offload capabilities when acceleration is disabled
|
||||
+ Prefer drmModeSetCursor2 over drmModeSetCursor
|
||||
+ Require at least xserver 1.8
|
||||
+ Move xorg_list backwards compatibility to new radeon_list.h header
|
||||
+ Add DRM event queue helpers v2
|
||||
+ DRI2: Simplify blit fallback handling for scheduled swaps
|
||||
+ DRI2: Remove superfluous assignments to *_info->frame
|
||||
+ DRI2: Move radeon_dri2_flip_event_handler
|
||||
+ DRI2: Use helper functions for DRM event queue management v3
|
||||
+ DRI2: Split out helper for getting UST and MSC of a specific CRTC
|
||||
+ Move #include "radeon_glamor.h" from radeon.h to where it's needed
|
||||
+ Fold radeon_glamor_flush into radeon_cs_flush_indirect
|
||||
+ Add support for SYNC extension fences v2
|
||||
+ Add support for the Present extension v2
|
||||
+ Add DRI3 support v2
|
||||
+ Simplify includes in radeon_{dri3,present}.c
|
||||
+ Add xorg_list_for_each_entry_safe fallback in radeon_list.h
|
||||
+ Initialize boolean variable before calling xf86GetOptValBool
|
||||
+ DRI3: Use open hook instead of open_client
|
||||
+ Always include misync.h before other misync headers
|
||||
+ glamor: Add glamor_fd_from_pixmap define for standalone glamor tree
|
||||
+ dri3: Use screen->CreatePixmap instead of fbCreatePixmap directly
|
||||
+ EXA: Return NULL from radeon_get_pixmap_bo if there is no driver private
|
||||
+ configure.ac: Check for misyncshm.h again
|
||||
+ Adapt radeon_sync.c for misyncshm.h vs misync.h as well
|
||||
+ Make radeon_do_pageflip take a BO handle directly
|
||||
+ Present: Add radeon_present_get_pixmap_handle helper
|
||||
+ glamor: Avoid generating GEM flink names for BOs shared via DRI3 v2
|
||||
+ glamor: Handle GLAMOR_* flags removed from xserver
|
||||
+ Increase robustness against DRM page flip ioctl failures v3
|
||||
+ Simplify radeon_do_pageflip() error handling slightly more
|
||||
+ Move radeon_drm_handler/abort_proc fields to drmmode_flipdata_rec
|
||||
+ Move get_pixmap_handle helper to radeon_bo_helper.c
|
||||
+ DRI2: Use radeon_get_pixmap_handle
|
||||
+ Only enable SYNC extension fences and the Present extension along with DRI3
|
||||
+ Add radeon_get_pixmap_tiling_flags helper
|
||||
+ present: Don't flip between BOs with different tiling parameters
|
||||
+ Rename scanout_pixmap_x field to prime_pixmap_x
|
||||
+ Split out struct drmmode_scanout for rotation shadow buffer information
|
||||
+ Add RADEON_CREATE_PIXMAP_SCANOUT flag
|
||||
+ glamor: Remove unused function radeon_glamor_pixmap_is_offscreen
|
||||
+ glamor: Add radeon_pixmap parameter to radeon_glamor_create_textured_pixmap
|
||||
+ glamor: Add wrappers for the X server rendering hooks
|
||||
+ glamor: Add Option "ShadowPrimary" v2
|
||||
+ glamor: Remove the stride member of struct radeon_pixmap
|
||||
+ Add Option "TearFree" v4
|
||||
+ DRI2: Clear old->devPrivate.ptr in fixup_glamor
|
||||
+ Only copy fbcon BO contents if bgNoneRoot is TRUE
|
||||
+ Defer initial drmmode_copy_fb call until root window creation
|
||||
+ Defer initial modeset until the first BlockHandler invocation
|
||||
+ Update scanout pixmap contents before setting a mode with it
|
||||
+ Make drmmode_copy_fb() work with glamor as well
|
||||
+ On screen resize, clear the new buffer before displaying it
|
||||
+ Don't call radeon_get_pixmap_private() when using EXA
|
||||
+ Skip disabled CRTCs in drmmode_set_desired_modes() even if set_hw == FALSE
|
||||
+ glamor: Deal with glamor_glyphs_init being removed from xserver
|
||||
+ Replace SyncFence typedef with declaration of struct _SyncFence
|
||||
+ present: Remove get_drmmode_crtc helper
|
||||
+ glamor: Only wait for GPU writes in radeon_glamor_prepare_access_cpu_ro
|
||||
+ DRI2: Fix handling of drmmode_crtc_get_ust_msc return code
|
||||
+ Don't attempt a DRI2/Present page flip while the other one is flipping
|
||||
+ Skip disabled CRTCs in radeon_scanout_(do_)update
|
||||
+ present: Fall back to modeset for unflip operation
|
||||
+ present: Look at all CRTCs to determine if we can flip
|
||||
+ present: Handle DPMS off in radeon_present_get_ust_msc
|
||||
+ Remove unused local variable pRADEONEnt
|
||||
+ glamor: Move declaration of struct radeon_pixmap out of #if/#else blocks
|
||||
+ Only call drmmode_copy_fb (at most) once on server startup
|
||||
+ Wait for scanout BO initialization to finish before setting mode
|
||||
+ DRI2: Don't ignore rotated CRTCs in amdgpu_dri2_drawable_crtc
|
||||
+ DRI2: Keep MSC monotonic when moving window between CRTCs
|
||||
+ Only align screen / scanout pixmap height where necessary
|
||||
+ Call xf86CrtcRotate from initial drmmode_set_desired_modes call
|
||||
+ Don't advertise rotation support without hardware acceleration v2
|
||||
+ Eliminate redundant data parameter from drmmode_crtc_scanout_create
|
||||
+ Properly handle drmModeAddFB failure in drmmode_crtc_scanout_allocate
|
||||
+ Bump version for 7.6.0 release
|
||||
+ Disable CRTCs when disabling the outputs
|
||||
+ Do not try to enable already enabled CRTCs in DPMS hook
|
||||
+ radeon: remove unneeded inclusion of sarea.h
|
||||
+ Handle failures in setting a CRTC to a DRM mode properly
|
||||
+ dri2: Avoid calculation with undefined msc value
|
||||
+ Simplify pick best crtc to fold two loops into one
|
||||
+ Clean up allocation in RADEONInitVideo()
|
||||
+ Simplify drmmode_set_mode_major() and avoid leaking memory.
|
||||
+ Clean up radeon_dri2_create_buffer2()
|
||||
- Remove upstream patches:
|
||||
* U_glamor-Handle-GLAMOR_-flags-removed-from-xserver.patch
|
||||
* U_radeon-adopt-for-new-X-server-dirty-tracking-APIs.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 11 14:59:56 UTC 2015 - sndirsch@suse.com
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
%define xserver_glamor 1
|
||||
|
||||
Name: xf86-video-ati
|
||||
Version: 7.5.0
|
||||
Version: 7.6.1
|
||||
Release: 0
|
||||
Summary: ATI video driver for the Xorg X server
|
||||
License: MIT
|
||||
@ -27,8 +27,6 @@ Group: System/X11/Servers/XF86_4
|
||||
Url: http://xorg.freedesktop.org/
|
||||
#http://xorg.freedesktop.org/releases/individual/driver/
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch0: U_radeon-adopt-for-new-X-server-dirty-tracking-APIs.patch
|
||||
Patch1: U_glamor-Handle-GLAMOR_-flags-removed-from-xserver.patch
|
||||
|
||||
BuildRequires: Mesa-devel
|
||||
BuildRequires: autoconf >= 2.60
|
||||
@ -70,8 +68,6 @@ driver as appropriate.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fi
|
||||
|
Loading…
x
Reference in New Issue
Block a user