xf86-video-ati: update to 7.5.0.
This commit is contained in:
parent
291788173e
commit
2c569d9019
3 changed files with 4 additions and 139 deletions
|
@ -1,64 +0,0 @@
|
||||||
From 94202cbfbca05a503acdc1cca2f8409d141173af Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Deucher <alexdeucher@gmail.com>
|
|
||||||
Date: Fri, 1 Aug 2014 21:55:40 +0200
|
|
||||||
Subject: radeon: enable hawaii accel conditionally (v3)
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Only if the kernel has the new CP firmware.
|
|
||||||
|
|
||||||
v2: check value of ACCEL_WORKING2
|
|
||||||
v3 (Andreas Boll):
|
|
||||||
- check for value 2 or 3 of ACCEL_WORKING2
|
|
||||||
- update man page
|
|
||||||
|
|
||||||
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> (v2)
|
|
||||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
|
|
||||||
|
|
||||||
diff --git a/man/radeon.man b/man/radeon.man
|
|
||||||
index 802f6c2..7dde040 100644
|
|
||||||
--- man/radeon.man
|
|
||||||
+++ man/radeon.man
|
|
||||||
@@ -229,8 +229,7 @@ Selects software cursor. The default is
|
|
||||||
Enables or disables all hardware acceleration.
|
|
||||||
.br
|
|
||||||
The default is
|
|
||||||
-.B on
|
|
||||||
-except for HAWAII.
|
|
||||||
+.B on.
|
|
||||||
.TP
|
|
||||||
.BI "Option \*qZaphodHeads\*q \*q" string \*q
|
|
||||||
Specify the RandR output(s) to use with zaphod mode for a particular driver
|
|
||||||
diff --git a/src/radeon_kms.c b/src/radeon_kms.c
|
|
||||||
index a5e77ef..171d919 100644
|
|
||||||
--- src/radeon_kms.c
|
|
||||||
+++ src/radeon_kms.c
|
|
||||||
@@ -387,8 +387,12 @@ static Bool RADEONIsAccelWorking(ScrnInfoPtr pScrn)
|
|
||||||
}
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
- if (tmp)
|
|
||||||
+ if (info->ChipFamily == CHIP_FAMILY_HAWAII) {
|
|
||||||
+ if (tmp == 2 || tmp == 3)
|
|
||||||
+ return TRUE;
|
|
||||||
+ } else if (tmp) {
|
|
||||||
return TRUE;
|
|
||||||
+ }
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -486,8 +490,7 @@ static Bool RADEONPreInitAccel_KMS(ScrnInfoPtr pScrn)
|
|
||||||
info->is_fast_fb = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL,
|
|
||||||
- info->ChipFamily != CHIP_FAMILY_HAWAII) ||
|
|
||||||
+ if (!xf86ReturnOptValBool(info->Options, OPTION_ACCEL, TRUE) ||
|
|
||||||
(!RADEONIsAccelWorking(pScrn))) {
|
|
||||||
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
|
|
||||||
"GPU accel disabled or not working, using shadowfb for KMS\n");
|
|
||||||
--
|
|
||||||
cgit v0.10.2
|
|
||||||
|
|
|
@ -1,71 +0,0 @@
|
||||||
From c4ae0e2cbcc0e2ebf9f13ee92d59b5120254a1dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michel Dänzer <michel.daenzer@amd.com>
|
|
||||||
Date: Mon, 30 Jun 2014 01:20:12 +0000
|
|
||||||
Subject: Handle CRTC DPMS from output DPMS hooks
|
|
||||||
|
|
||||||
This fixes at least two issues:
|
|
||||||
|
|
||||||
The CRTC DPMS hook isn't called after a modeset, so the vertical blank
|
|
||||||
interrupt emulation code considered the CRTC disabled after a modeset. As
|
|
||||||
a side effect, page flipping was no longer used after a modeset.
|
|
||||||
|
|
||||||
This change also makes sure the vertical blank interrupt emulation code
|
|
||||||
runs before the hardware CRTC is disabled and after it's enabled from the
|
|
||||||
output DPMS hook. The wrong order could cause gnome-shell to hang after
|
|
||||||
a suspend/resume and/or DPMS off/on cycle.
|
|
||||||
|
|
||||||
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
|
|
||||||
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
---
|
|
||||||
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
|
|
||||||
index bd8e701..c366203 100644
|
|
||||||
--- src/drmmode_display.c
|
|
||||||
+++ src/drmmode_display.c
|
|
||||||
@@ -247,7 +247,7 @@ int drmmode_get_current_ust(int drm_fd, CARD64 *ust)
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
-drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
|
|
||||||
+drmmode_do_crtc_dpms(xf86CrtcPtr crtc, int mode)
|
|
||||||
{
|
|
||||||
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
|
|
||||||
ScrnInfoPtr scrn = crtc->scrn;
|
|
||||||
@@ -308,6 +308,12 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
|
|
||||||
drmmode_crtc->dpms_mode = mode;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void
|
|
||||||
+drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
|
|
||||||
+{
|
|
||||||
+ /* Nothing to do. drmmode_do_crtc_dpms() is called as appropriate */
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static PixmapPtr
|
|
||||||
create_pixmap_for_fbcon(drmmode_ptr drmmode,
|
|
||||||
ScrnInfoPtr pScrn, int fbcon_id)
|
|
||||||
@@ -973,9 +979,14 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
|
|
||||||
drmModeConnectorPtr koutput = drmmode_output->mode_output;
|
|
||||||
drmmode_ptr drmmode = drmmode_output->drmmode;
|
|
||||||
|
|
||||||
+ if (mode != DPMSModeOn && output->crtc)
|
|
||||||
+ drmmode_do_crtc_dpms(output->crtc, mode);
|
|
||||||
+
|
|
||||||
drmModeConnectorSetProperty(drmmode->fd, koutput->connector_id,
|
|
||||||
drmmode_output->dpms_enum_id, mode);
|
|
||||||
- return;
|
|
||||||
+
|
|
||||||
+ if (mode == DPMSModeOn && output->crtc)
|
|
||||||
+ drmmode_do_crtc_dpms(output->crtc, mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1833,6 +1844,7 @@ Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
|
|
||||||
|
|
||||||
/* Skip disabled CRTCs */
|
|
||||||
if (!crtc->enabled) {
|
|
||||||
+ drmmode_do_crtc_dpms(crtc, DPMSModeOff);
|
|
||||||
drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
|
|
||||||
0, 0, 0, NULL, 0, NULL);
|
|
||||||
continue;
|
|
||||||
--
|
|
||||||
cgit v0.9.0.2-2-gbebe
|
|
|
@ -1,13 +1,13 @@
|
||||||
# Template build file for 'xf86-video-ati'.
|
# Template build file for 'xf86-video-ati'.
|
||||||
pkgname=xf86-video-ati
|
pkgname=xf86-video-ati
|
||||||
version=7.4.0
|
version=7.5.0
|
||||||
revision=7
|
revision=1
|
||||||
lib32disabled=yes
|
lib32disabled=yes
|
||||||
only_for_archs="i686 x86_64"
|
only_for_archs="i686 x86_64"
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--enable-glamor"
|
configure_args="--enable-glamor"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="xf86driproto libudev-devel>=183 libpciaccess-devel
|
makedepends="xf86driproto libudev-devel libpciaccess-devel
|
||||||
libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.16<1.17"
|
libdrm-devel pixman-devel MesaLib-devel xorg-server-devel>=1.16<1.17"
|
||||||
depends="virtual?xserver-abi-video-18_1 mesa-ati-dri"
|
depends="virtual?xserver-abi-video-18_1 mesa-ati-dri"
|
||||||
replaces="xf86-video-ati>=0"
|
replaces="xf86-video-ati>=0"
|
||||||
|
@ -16,4 +16,4 @@ maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://xorg.freedesktop.org"
|
homepage="http://xorg.freedesktop.org"
|
||||||
license="MIT"
|
license="MIT"
|
||||||
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
distfiles="${XORG_SITE}/driver/$pkgname-$version.tar.bz2"
|
||||||
checksum=96230ca9859a2a3e347b7f37597b7b344e80b83f378d3a8463ab1ceb69df76d9
|
checksum=ec3e6f06b6cf9a40c72aafa3448aae8b034c80b37410ca9442d5cf6806e07936
|
||||||
|
|
Loading…
Add table
Reference in a new issue