Hello community,
here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory
checked in at Fri Mar 20 20:45:33 CET 2009.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-14 03:53:25.000000000 +0100
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2009-03-20 03:26:05.744951064 +0100
@@ -1,0 +2,14 @@
+Fri Mar 20 03:24:25 CET 2009 - sndirsch@suse.de
+
+- xf86-video-i740 1.3.0
+ * Uncomment DDC2 code, move it before mode validation so DDC has
+ some effect.
+
+-------------------------------------------------------------------
+Thu Mar 19 03:25:21 CET 2009 - sndirsch@suse.de
+
+- xf86-video-ati 6.12.1
+ * Fix some fall out from the r6xx/r7xx merge and fix load
+ detection on avivo chips.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xf86-video-ati-6.12.0.tar.bz2
xf86-video-i740-1.2.0.tar.bz2
New:
----
xf86-video-ati-6.12.1.tar.bz2
xf86-video-i740-1.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.oT5290/_old 2009-03-20 20:44:39.000000000 +0100
+++ /var/tmp/diff_new_pack.oT5290/_new 2009-03-20 20:44:39.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 49
+Release: 50
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -42,7 +42,7 @@
Source8: xf86-video-fbdev-0.4.0.tar.bz2
Source9: xf86-video-glint-1.2.2.tar.bz2
Source10: xf86-video-i128-1.3.1.tar.bz2
-Source11: xf86-video-i740-1.2.0.tar.bz2
+Source11: xf86-video-i740-1.3.0.tar.bz2
Source14: xf86-video-mga-1.4.9.tar.bz2
Source15: xf86-video-neomagic-1.2.2.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
@@ -67,7 +67,7 @@
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.6.99.901.tar.bz2
-Source46: xf86-video-ati-6.12.0.tar.bz2
+Source46: xf86-video-ati-6.12.1.tar.bz2
Source48: xf86-video-mga-1.9.100.tar.bz2
Source50: xf86-video-xgi-1.5.0.tar.bz2
Source51: xf86-video-geode-2.11.1.tar.bz2
@@ -271,6 +271,14 @@
/var/lib/hardware/ids/20.%{name}
%changelog
+* Fri Mar 20 2009 sndirsch@suse.de
+- xf86-video-i740 1.3.0
+ * Uncomment DDC2 code, move it before mode validation so DDC has
+ some effect.
+* Thu Mar 19 2009 sndirsch@suse.de
+- xf86-video-ati 6.12.1
+ * Fix some fall out from the r6xx/r7xx merge and fix load
+ detection on avivo chips.
* Sat Mar 14 2009 sndirsch@suse.de
- xf86-video-ati 6.12.0
* Big changes here are EXA and Xv support for R6xx/R7xx chips.
++++++ xf86-video-ati-6.12.0.tar.bz2 -> xf86-video-ati-6.12.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/ChangeLog new/xf86-video-ati-6.12.1/ChangeLog
--- old/xf86-video-ati-6.12.0/ChangeLog 2009-03-14 00:22:07.000000000 +0100
+++ new/xf86-video-ati-6.12.1/ChangeLog 2009-03-19 01:47:06.000000000 +0100
@@ -1,3 +1,95 @@
+commit 537da7018b0fd2ad263fc5cdc55b3b85cf8e9205
+Author: Alex Deucher
+Date: Wed Mar 18 19:22:55 2009 -0400
+
+ ATOM: fix up tv-out support
+
+ - fix purple hue when using ATOMTvOut option
+ - fix TV load detection on newer r6xx/r7xx chips
+ - disable CV for now
+
+commit c0e2513ab128ddd5be0ed626d9e31777a98983ef
+Author: Alex Deucher
+Date: Wed Mar 18 14:08:30 2009 -0400
+
+ R6xx/R7xx AGP: disable gart data transfers
+
+ UTS/DFS/Xv
+
+ Doesn't seem to be reliable on AGP.
+
+ fixes bugs: 20436, 20236, several reports on ML and IRC
+
+commit e3e1f0c7b892b094b292081021a0e97932b8e079
+Author: Fabio
+Date: Wed Mar 18 12:13:53 2009 -0400
+
+ man page update
+
+commit 6ae54d3ea023968887bf0cb0ec1be2115621d554
+Author: Alex Deucher
+Date: Wed Mar 18 11:50:22 2009 -0400
+
+ AVIVO: Fix dac load detection
+
+commit 04e36b794c216e4fa77c780fd989df1ef1c7f0d9
+Author: Fabio
+Date: Tue Mar 17 11:29:26 2009 -0400
+
+ man page updates
+
+ from bug 20648
+
+commit a6855c370194b6df307ea33724fe17a85d67607e
+Author: Alex Deucher
+Date: Mon Mar 16 13:52:42 2009 -0400
+
+ radeon: add another AGP quirk
+
+ bug 20647
+
+commit a55ced5ee20c07e743c7c0978803fd10589c1531
+Author: Alex Deucher
+Date: Sun Mar 15 12:08:04 2009 -0400
+
+ Fix fallout from r6xx/r7xx EXA merge in IB handling
+
+ Noticed Christiaan van Dijk.
+ Should fix bug 20510
+
+commit a065eeb9b301ab452cc8fbd3cac1fd9a3841c4e1
+Author: Alex Deucher
+Date: Sat Mar 14 18:40:28 2009 -0400
+
+ atom: fix up bios scartch register usage
+
+ the bios scratch registers keep 3 types of state for each output:
+ 1. dpms
+ 2. active
+ 3. connected
+
+ some of the command tables use the active flags. We used to set the active
+ flags based on dpms state, but instead set them based on whether they are
+ connected or not.
+
+commit 5c4ef924d082fd3b279f62fda7a97f563b009d38
+Author: Alex Deucher
+Date: Sat Mar 14 18:16:49 2009 -0400
+
+ radeon: fix typo in bios scratch reg setup
+
+commit 96fce5a56269509a935e8ee621a5e17cc9005ddc
+Author: Alex Deucher
+Date: Fri Mar 13 19:29:58 2009 -0400
+
+ Bump post-release
+
+commit 8da1b82a70de7b3ef38905bd77c58a20fd44ddd6
+Author: Alex Deucher
+Date: Fri Mar 13 19:23:19 2009 -0400
+
+ bump for release
+
commit 28d9d699dcdff394aa561505f7f54f08db800828
Author: Alex Deucher
Date: Fri Mar 13 18:18:31 2009 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/configure new/xf86-video-ati-6.12.1/configure
--- old/xf86-video-ati-6.12.0/configure 2009-03-14 00:20:40.000000000 +0100
+++ new/xf86-video-ati-6.12.1/configure 2009-03-19 01:45:05.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.12.0.
+# Generated by GNU Autoconf 2.61 for xf86-video-ati 6.12.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-ati'
PACKAGE_TARNAME='xf86-video-ati'
-PACKAGE_VERSION='6.12.0'
-PACKAGE_STRING='xf86-video-ati 6.12.0'
+PACKAGE_VERSION='6.12.1'
+PACKAGE_STRING='xf86-video-ati 6.12.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1443,7 +1443,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-video-ati 6.12.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-ati 6.12.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-ati 6.12.0:";;
+ short | recursive ) echo "Configuration of xf86-video-ati 6.12.1:";;
esac
cat <<\_ACEOF
@@ -1635,7 +1635,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-ati configure 6.12.0
+xf86-video-ati configure 6.12.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1649,7 +1649,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-ati $as_me 6.12.0, which was
+It was created by xf86-video-ati $as_me 6.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2344,7 +2344,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-ati'
- VERSION='6.12.0'
+ VERSION='6.12.1'
cat >>confdefs.h <<_ACEOF
@@ -23705,7 +23705,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-ati $as_me 6.12.0, which was
+This file was extended by xf86-video-ati $as_me 6.12.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23758,7 +23758,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-video-ati config.status 6.12.0
+xf86-video-ati config.status 6.12.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/configure.ac new/xf86-video-ati-6.12.1/configure.ac
--- old/xf86-video-ati-6.12.0/configure.ac 2009-03-14 00:20:28.000000000 +0100
+++ new/xf86-video-ati-6.12.1/configure.ac 2009-03-19 01:44:39.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ati],
- 6.12.0,
+ 6.12.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ati)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/man/radeon.man new/xf86-video-ati-6.12.1/man/radeon.man
--- old/xf86-video-ati-6.12.0/man/radeon.man 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/man/radeon.man 2009-03-18 17:13:23.000000000 +0100
@@ -568,27 +568,60 @@
The default is
.B off.
+.SH TEXTURED VIDEO ATTRIBUTES
+The driver supports the following X11 Xv attributes for Textured Video.
+You can use the "xvattr" tool to query/set those attributes at runtime.
+
+.TP
+.BI "XV_VSYNC"
+XV_VSYNC is used to control whether textured adapter synchronizes
+the screen update to the monitor vertical refresh to eliminate tearing.
+It has two values: 'off'(0) and 'on'(1). The default is
+.B 'on'(1).
+
+.TP
+.BI "XV_BICUBIC"
+XV_BICUBIC is used to control whether textured adapter should apply
+a bicubic filter to smooth the output. It has three values: 'off'(0), 'on'(1)
+and 'auto'(2). 'off' means never apply the filter, 'on' means always apply
+the filter and 'auto' means apply the filter only if the X and Y
+sizes are scaled to more than double, this to avoid blurred output.
+The default is
+.B 'auto'(2).
+
.SH SEE ALSO
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.IP " 1." 4
-Overview about radeon development code
+Wiki page:
.RS 4
-\%http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/
+http://www.x.org/wiki/radeon
.RE
.IP " 2." 4
-Query the bugtracker for radeon bugs
+Overview about radeon development code:
.RS 4
-.nf
-\%https://bugs.freedesktop.org/query.cgi?\:product=\:xorg&\:component=\:Driver/Radeon
-.fi
+http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/
.RE
.IP " 3." 4
-Submit bugs & patches
+Mailing list:
.RS 4
-.nf
-\%https://bugs.freedesktop.org/enter_bug.cgi?\:product=\:xorg&\:component=\:Driver/Radeon
-.fi
+http://lists.x.org/mailman/listinfo/xorg-driver-ati
.RE
+.IP " 4." 4
+IRC channel:
+.RS 4
+#radeon on irc.freenode.net
+.RE
+.IP " 5." 4
+Query the bugtracker for radeon bugs:
+.RS 4
+https://bugs.freedesktop.org/query.cgi?product=xorg&component=Driver/Radeon
+.RE
+.IP " 6." 4
+Submit bugs & patches:
+.RS 4
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Radeon
+.RE
+
.SH AUTHORS
.nf
Authors include:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/atombios_output.c new/xf86-video-ati-6.12.1/src/atombios_output.c
--- old/xf86-video-ati-6.12.0/src/atombios_output.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/atombios_output.c 2009-03-19 01:30:45.000000000 +0100
@@ -1625,34 +1625,68 @@
if (radeon_output->devices & ATOM_DEVICE_CRT1_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT1_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
- (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CRT1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
} else if (radeon_output->devices & ATOM_DEVICE_CRT2_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CRT2_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
- (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CRT2_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CRT2_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
} else if (radeon_output->devices & ATOM_DEVICE_CV_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_CV_SUPPORT);
- if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
- (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_CV_INDEX] &&
+ (info->encoders[ATOM_DEVICE_CV_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
if (minor >= 3)
dac_data.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
} else if (radeon_output->devices & ATOM_DEVICE_TV1_SUPPORT) {
dac_data.sDacload.usDeviceID = cpu_to_le16(ATOM_DEVICE_TV1_SUPPORT);
- if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
- (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
- dac_data.sDacload.ucDacType = ATOM_DAC_A;
- else
- dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ if (IS_AVIVO_VARIANT) {
+ if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ } else {
+ if (info->encoders[ATOM_DEVICE_TV1_INDEX] &&
+ (info->encoders[ATOM_DEVICE_TV1_INDEX]->encoder_id == ENCODER_OBJECT_ID_INTERNAL_DAC1))
+ dac_data.sDacload.ucDacType = ATOM_DAC_A;
+ else
+ dac_data.sDacload.ucDacType = ATOM_DAC_B;
+ }
+ if (minor >= 3)
+ dac_data.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb;
} else {
ErrorF("invalid output device for dac detection\n");
return ATOM_NOT_IMPLEMENTED;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/r600_exa.c new/xf86-video-ati-6.12.1/src/r600_exa.c
--- old/xf86-video-ati-6.12.0/src/r600_exa.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/r600_exa.c 2009-03-18 18:53:37.000000000 +0100
@@ -2084,8 +2084,11 @@
info->accel_state->exa->PrepareAccess = R600PrepareAccess;
info->accel_state->exa->FinishAccess = R600FinishAccess;
- info->accel_state->exa->UploadToScreen = R600UploadToScreen;
- info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
+ /* AGP seems to have problems with gart transfers */
+ if (info->accelDFS) {
+ info->accel_state->exa->UploadToScreen = R600UploadToScreen;
+ info->accel_state->exa->DownloadFromScreen = R600DownloadFromScreen;
+ }
info->accel_state->exa->flags = EXA_OFFSCREEN_PIXMAPS;
#ifdef EXA_SUPPORTS_PREPARE_AUX
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_accel.c new/xf86-video-ati-6.12.1/src/radeon_accel.c
--- old/xf86-video-ati-6.12.0/src/radeon_accel.c 2009-03-07 03:20:00.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_accel.c 2009-03-15 17:07:06.000000000 +0100
@@ -688,8 +688,6 @@
drmBufPtr buffer = info->cp->indirectBuffer;
int start = info->cp->indirectStart;
drm_radeon_indirect_t indirect;
- RING_LOCALS;
- RADEONCP_REFRESH(pScrn, info);
if (!buffer) return;
if (start == buffer->used && !discard) return;
@@ -700,10 +698,14 @@
}
if (info->ChipFamily >= CHIP_FAMILY_R600) {
- while (buffer->used & 0x3c){
- BEGIN_RING(1);
- OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
- ADVANCE_RING();
+ if (buffer->used & 0x3c) {
+ RING_LOCALS;
+
+ while (buffer->used & 0x3c) {
+ BEGIN_RING(1);
+ OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
+ ADVANCE_RING();
+ }
}
}
@@ -735,12 +737,11 @@
drmBufPtr buffer = info->cp->indirectBuffer;
int start = info->cp->indirectStart;
drm_radeon_indirect_t indirect;
- RING_LOCALS;
- RADEONCP_REFRESH(pScrn, info);
-
if (info->ChipFamily >= CHIP_FAMILY_R600) {
- if (buffer) {
+ if (buffer && (buffer->used & 0x3c)) {
+ RING_LOCALS;
+
while (buffer->used & 0x3c) {
BEGIN_RING(1);
OUT_RING(CP_PACKET2()); /* fill up to multiple of 16 dwords */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_atombios.c new/xf86-video-ati-6.12.1/src/radeon_atombios.c
--- old/xf86-video-ati-6.12.0/src/radeon_atombios.c 2009-03-01 19:14:02.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_atombios.c 2009-03-19 01:30:45.000000000 +0100
@@ -1771,14 +1771,19 @@
con_obj_type = (path->usConnObjectId & OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT;
if ((path->usDeviceTag == ATOM_DEVICE_TV1_SUPPORT) ||
- (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT) ||
- (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT)) {
+ (path->usDeviceTag == ATOM_DEVICE_TV2_SUPPORT)) {
if (!enable_tv) {
info->BiosConnector[i].valid = FALSE;
continue;
}
}
+ /* don't support CV yet */
+ if (path->usDeviceTag == ATOM_DEVICE_CV_SUPPORT) {
+ info->BiosConnector[i].valid = FALSE;
+ continue;
+ }
+
if ((info->ChipFamily == CHIP_FAMILY_RS780) &&
(con_obj_id == CONNECTOR_OBJECT_ID_PCIE_CONNECTOR)) {
uint32_t slot_config, ct;
@@ -2203,7 +2208,8 @@
continue;
}
- if (!enable_tv && (i == ATOM_DEVICE_CV_INDEX)) {
+ /* don't support CV yet */
+ if (i == ATOM_DEVICE_CV_INDEX) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Skipping Component Video\n");
info->BiosConnector[i].valid = FALSE;
continue;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_dri.c new/xf86-video-ati-6.12.1/src/radeon_dri.c
--- old/xf86-video-ati-6.12.0/src/radeon_dri.c 2009-03-12 08:42:08.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_dri.c 2009-03-16 18:50:31.000000000 +0100
@@ -749,6 +749,8 @@
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4c59, PCI_VENDOR_IBM,0x052f, 1 },
/* Intel 82855PM host bridge / Mobility 9600 M10 RV350 Needs AGPMode 1 (lp #195051) */
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4e50, PCI_VENDOR_IBM,0x0550, 1 },
+ /* Intel 82855PM host bridge / FireGL Mobility T2 RV350 Needs AGPMode 2 (fdo #20647) */
+ { PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x4e54, PCI_VENDOR_IBM,0x054f, 2 },
/* Intel 82855PM host bridge / Mobility M9+ / VaioPCG-V505DX Needs AGPMode 2 (fdo #17928) */
{ PCI_VENDOR_INTEL,0x3340, PCI_VENDOR_ATI,0x5c61, PCI_VENDOR_SONY,0x816b, 2 },
/* Intel 82855PM Processor to I/O Controller / Mobility M9+ Needs AGPMode 8 (phoronix forum) */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_driver.c new/xf86-video-ati-6.12.1/src/radeon_driver.c
--- old/xf86-video-ati-6.12.0/src/radeon_driver.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_driver.c 2009-03-18 18:53:31.000000000 +0100
@@ -2375,7 +2375,11 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Page Flipping %sabled%s\n",
info->dri->allowPageFlip ? "en" : "dis", reason);
- info->DMAForXv = TRUE;
+ /* AGP seems to have problems with gart transfers */
+ if ((info->ChipFamily >= CHIP_FAMILY_R600) && (info->cardType == CARD_AGP))
+ info->DMAForXv = FALSE;
+ else
+ info->DMAForXv = TRUE;
from = xf86GetOptValBool(info->Options, OPTION_XV_DMA, &info->DMAForXv)
? X_CONFIG : X_INFO;
xf86DrvMsg(pScrn->scrnIndex, from,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xf86-video-ati-6.12.0/src/radeon_output.c new/xf86-video-ati-6.12.1/src/radeon_output.c
--- old/xf86-video-ati-6.12.0/src/radeon_output.c 2009-03-13 23:24:21.000000000 +0100
+++ new/xf86-video-ati-6.12.1/src/radeon_output.c 2009-03-14 23:38:13.000000000 +0100
@@ -631,93 +631,60 @@
if (info->IsAtomBios) {
if (radeon_output->active_device & ATOM_DEVICE_TV1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_TV1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_TV1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CV_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CV_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CV_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CV_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CRT1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CRT1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_CRT2_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_CRT2_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_LCD1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_LCD1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP1_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP1_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP2_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP2_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP3_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP3_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP3_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP4_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP4_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP4_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP5_SUPPORT) {
- if (mode == DPMSModeOn) {
+ if (mode == DPMSModeOn)
save->bios_2_scratch &= ~ATOM_S2_DFP5_DPMS_STATE;
- save->bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
- } else {
+ else
save->bios_2_scratch |= ATOM_S2_DFP5_DPMS_STATE;
- save->bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
- }
}
- if (info->ChipFamily >= CHIP_FAMILY_R600) {
+ if (info->ChipFamily >= CHIP_FAMILY_R600)
OUTREG(R600_BIOS_2_SCRATCH, save->bios_2_scratch);
- OUTREG(R600_BIOS_3_SCRATCH, save->bios_3_scratch);
- } else {
+ else
OUTREG(RADEON_BIOS_2_SCRATCH, save->bios_2_scratch);
- OUTREG(RADEON_BIOS_3_SCRATCH, save->bios_3_scratch);
- }
} else {
if (mode == DPMSModeOn) {
save->bios_6_scratch &= ~(RADEON_DPMS_MASK | RADEON_SCREEN_BLANKING);
@@ -727,55 +694,36 @@
save->bios_6_scratch |= (RADEON_DPMS_OFF | RADEON_SCREEN_BLANKING);
}
if (radeon_output->active_device & ATOM_DEVICE_TV1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_TV1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_TV_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_TV1_ON;
+ else
save->bios_6_scratch &= ~RADEON_TV_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_CRT1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_CRT_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_CRT1_ON;
+ else
save->bios_6_scratch &= ~RADEON_CRT_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_CRT2_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_CRT_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_CRT2_ON;
+ else
save->bios_6_scratch &= ~RADEON_CRT_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_LCD1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_LCD_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_LCD1_ON;
+ else
save->bios_6_scratch &= ~RADEON_LCD_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_DFP1_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_DFP_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_DFP1_ON;
+ else
save->bios_6_scratch &= ~RADEON_DFP_DPMS_ON;
- }
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- if (mode == DPMSModeOn) {
- save->bios_5_scratch |= RADEON_DFP2_ON;
+ if (mode == DPMSModeOn)
save->bios_6_scratch |= RADEON_DFP_DPMS_ON;
- } else {
- save->bios_5_scratch &= ~RADEON_DFP2_ON;
+ else
save->bios_6_scratch &= ~RADEON_DFP_DPMS_ON;
- }
}
- OUTREG(RADEON_BIOS_5_SCRATCH, save->bios_5_scratch);
OUTREG(RADEON_BIOS_6_SCRATCH, save->bios_6_scratch);
}
}
@@ -796,25 +744,25 @@
save->bios_3_scratch &= ~ATOM_S3_TV1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 18);
} else if (radeon_output->active_device & ATOM_DEVICE_CV_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CV_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CV_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 24);
} else if (radeon_output->active_device & ATOM_DEVICE_CRT1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CRT1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CRT1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 16);
} else if (radeon_output->active_device & ATOM_DEVICE_CRT2_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_CRT2_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_CRT2_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 20);
} else if (radeon_output->active_device & ATOM_DEVICE_LCD1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_LCD1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_LCD1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 17);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP1_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP1_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP1_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 19);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP2_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP2_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP2_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 23);
} else if (radeon_output->active_device & ATOM_DEVICE_DFP3_SUPPORT) {
- save->bios_2_scratch &= ~ATOM_S3_DFP3_CRTC_ACTIVE;
+ save->bios_3_scratch &= ~ATOM_S3_DFP3_CRTC_ACTIVE;
save->bios_3_scratch |= (radeon_crtc->crtc_id << 25);
}
if (info->ChipFamily >= CHIP_FAMILY_R600)
@@ -857,66 +805,101 @@
if (info->IsAtomBios) {
switch (radeon_output->active_device) {
case ATOM_DEVICE_TV1_SUPPORT:
- if (!connected)
+ if (connected)
+ save->bios_3_scratch |= ATOM_S3_TV1_ACTIVE;
+ else {
save->bios_0_scratch &= ~ATOM_S0_TV1_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CV_SUPPORT:
- if (!connected)
+ if (connected)
+ save->bios_3_scratch |= ATOM_S3_CV_ACTIVE;
+ else {
save->bios_0_scratch &= ~ATOM_S0_CV_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;
+ }
break;
case ATOM_DEVICE_LCD1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_LCD1;
- else
+ save->bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_LCD1;
+ save->bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CRT1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_CRT1_COLOR;
- else
+ save->bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_CRT1_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;
+ }
break;
case ATOM_DEVICE_CRT2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_CRT2_COLOR;
- else
+ save->bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_CRT2_MASK;
+ save->bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP1;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP1;
+ save->bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP2;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP2;
+ save->bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP3_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP3;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP3;
+ save->bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP4_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP4;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP4;
+ save->bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;
+ }
break;
case ATOM_DEVICE_DFP5_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_0_scratch |= ATOM_S0_DFP5;
- else
+ save->bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;
+ } else {
save->bios_0_scratch &= ~ATOM_S0_DFP5;
+ save->bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;
+ }
break;
}
- if (info->ChipFamily >= CHIP_FAMILY_R600)
+ if (info->ChipFamily >= CHIP_FAMILY_R600) {
OUTREG(R600_BIOS_0_SCRATCH, save->bios_0_scratch);
- else
+ OUTREG(R600_BIOS_3_SCRATCH, save->bios_3_scratch);
+ } else {
OUTREG(RADEON_BIOS_0_SCRATCH, save->bios_0_scratch);
+ OUTREG(RADEON_BIOS_3_SCRATCH, save->bios_3_scratch);
+ }
} else {
switch (radeon_output->active_device) {
case ATOM_DEVICE_TV1_SUPPORT:
@@ -925,41 +908,60 @@
save->bios_4_scratch |= RADEON_TV1_ATTACHED_SVIDEO;
else if (radeon_output->MonType == MT_CTV)
save->bios_4_scratch |= RADEON_TV1_ATTACHED_COMP;
- } else
+ save->bios_5_scratch |= RADEON_TV1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_TV1_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_TV1_ON;
+ }
break;
case ATOM_DEVICE_LCD1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_LCD1_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_LCD1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_LCD1_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_LCD1_ON;
+ }
break;
case ATOM_DEVICE_CRT1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_CRT1_ATTACHED_COLOR;
- else
+ save->bios_5_scratch |= RADEON_CRT1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_CRT1_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_CRT1_ON;
+ }
break;
case ATOM_DEVICE_CRT2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_CRT2_ATTACHED_COLOR;
- else
+ save->bios_5_scratch |= RADEON_CRT2_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_CRT2_ATTACHED_MASK;
+ save->bios_5_scratch &= ~RADEON_CRT2_ON;
+ }
break;
case ATOM_DEVICE_DFP1_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_DFP1_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_DFP1_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_DFP1_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_DFP1_ON;
+ }
break;
case ATOM_DEVICE_DFP2_SUPPORT:
- if (connected)
+ if (connected) {
save->bios_4_scratch |= RADEON_DFP2_ATTACHED;
- else
+ save->bios_5_scratch |= RADEON_DFP2_ON;
+ } else {
save->bios_4_scratch &= ~RADEON_DFP2_ATTACHED;
+ save->bios_5_scratch &= ~RADEON_DFP2_ON;
+ }
break;
}
OUTREG(RADEON_BIOS_4_SCRATCH, save->bios_4_scratch);
+ OUTREG(RADEON_BIOS_5_SCRATCH, save->bios_5_scratch);
}
}
++++++ xf86-video-i740-1.2.0.tar.bz2 -> xf86-video-i740-1.3.0.tar.bz2 ++++++
++++ 59136 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/config.h.in new/xf86-video-i740-1.3.0/config.h.in
--- old/xf86-video-i740-1.2.0/config.h.in 2008-03-19 19:18:47.000000000 +0100
+++ new/xf86-video-i740-1.3.0/config.h.in 2009-03-19 20:25:30.000000000 +0100
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/configure.ac new/xf86-video-i740-1.3.0/configure.ac
--- old/xf86-video-i740-1.2.0/configure.ac 2008-03-19 19:18:31.000000000 +0100
+++ new/xf86-video-i740-1.3.0/configure.ac 2009-03-19 20:25:09.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i740],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i740)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/man/i740.man new/xf86-video-i740-1.3.0/man/i740.man
--- old/xf86-video-i740-1.2.0/man/i740.man 2008-03-19 15:29:41.000000000 +0100
+++ new/xf86-video-i740-1.3.0/man/i740.man 2009-03-19 20:24:14.000000000 +0100
@@ -25,6 +25,6 @@
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i740-1.2.0/src/i740_driver.c new/xf86-video-i740-1.3.0/src/i740_driver.c
--- old/xf86-video-i740-1.2.0/src/i740_driver.c 2008-03-19 19:18:21.000000000 +0100
+++ new/xf86-video-i740-1.3.0/src/i740_driver.c 2008-08-15 21:45:05.000000000 +0200
@@ -47,10 +47,6 @@
* DGA
*/
-#ifndef USE_DDC2
-#define USE_DDC2 0
-#endif
-
/*
* These are X and server generic header files.
*/
@@ -239,22 +235,6 @@
};
#endif
-#if USE_DDC2
-static const char *ddcSymbols[] = {
- "xf86PrintEDID",
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- NULL
-};
-#endif
-
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(i740Setup);
@@ -297,9 +277,6 @@
*/
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
ramdacSymbols, vbeSymbols,
-#if USE_DDC2
- ddcSymbols, i2cSymbols,
-#endif
NULL);
/*
@@ -454,6 +431,7 @@
return foundScreen;
}
+/* Ugh. Can we not do this? */
static void
I740ProbeDDC(ScrnInfoPtr pScrn, int index)
{
@@ -745,6 +723,32 @@
clockRanges->interlaceAllowed = FALSE; /*PL*/
clockRanges->doubleScanAllowed = TRUE; /*PL*/
+ { /*PL*/
+
+ if (xf86LoadSubModule(pScrn, "ddc")) {
+ if (xf86LoadSubModule(pScrn, "i2c") ) {
+ if (I740MapMem(pScrn)) {
+ if (I740_I2CInit(pScrn))
+ {
+ xf86MonPtr MonInfo;
+ if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) {
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
+ MonInfo);
+ xf86PrintEDID( MonInfo );
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
+ "info\n\n");
+ xf86SetDDCproperties(pScrn,MonInfo);
+ }
+ }
+ else
+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
+
+ I740UnmapMem(pScrn);
+ }
+ }
+ }
+ }
+
i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, clockRanges,
0, 320, 1600,
@@ -819,40 +823,6 @@
pI740->usevgacompat=FALSE;
-#if USE_DDC2 /*DDC2*/
- { /*PL*/
-
- if (xf86LoadSubModule(pScrn, "ddc")) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
- if ( xf86LoadSubModule(pScrn, "i2c") ) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
-
- if (I740MapMem(pScrn))
- {
- if (I740_I2CInit(pScrn))
- {
- xf86MonPtr MonInfo;
-
- if ((MonInfo = xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c))) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "DDC Monitor info: %p\n",
- MonInfo);
- xf86PrintEDID( MonInfo );
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "end of DDC Monitor "
- "info\n\n");
- xf86SetDDCproperties(pScrn,MonInfo);
- }
-
- //xf86SetDDCproperties(pScrn,xf86PrintEDID( xf86DoEDID_DDC2(pScrn->scrnIndex,pI740->rc_i2c)));
- }
- else
- xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"I2C initialization failed\n");
-
- I740UnmapMem(pScrn);
- }
- }
- }
- }
-#endif /*DDC2*/
{ /* Overlay */
pI740->colorKey = (1 << pScrn->offset.red) | (1 << pScrn->offset.green) |
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org