rpms/xorg-x11-drv-ati/devel radeon-git-upstream-fixes.patch, 1.5, 1.6 xorg-x11-drv-ati.spec, 1.80, 1.81
Dave Airlie (airlied)
fedora-extras-commits at redhat.com
Sun Feb 17 23:46:59 UTC 2008
- Previous message (by thread): rpms/libggz/devel .cvsignore, 1.2, 1.3 libggz.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ggz-client-libs/devel .cvsignore, 1.2, 1.3 ggz-client-libs.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20172
Modified Files:
radeon-git-upstream-fixes.patch xorg-x11-drv-ati.spec
Log Message:
* Mon Feb 18 2008 Dave Airlie <airlied at redhat.com> 6.7.197-3
- rebase to upstream git master - lots of r600 fixes
radeon-git-upstream-fixes.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 radeon-git-upstream-fixes.patch
Index: radeon-git-upstream-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-git-upstream-fixes.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- radeon-git-upstream-fixes.patch 8 Feb 2008 04:06:15 -0000 1.5
+++ radeon-git-upstream-fixes.patch 17 Feb 2008 23:46:36 -0000 1.6
@@ -1,3 +1,165 @@
+commit d055b9e800ae50d08cca9db75fc666ce1da9ab52
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Feb 16 09:13:43 2008 +1000
+
+ r128/radeon: hopeful fix for non pci access code
+
+commit c773bc6a314327da29e21e4ebac6fa7f3e98a0a7
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Feb 16 09:05:07 2008 +1000
+
+ r128/radeon: fix build without pciaccess
+
+commit 690a52da5248f47a587a878d05fce9784957970b
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Feb 16 08:33:36 2008 +1000
+
+ mach64: fix non pciaccess build
+
+commit fc85188fd95bf78b7f965cdde3e22b644c74ff81
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:36:10 2008 +0200
+
+ ati: convert to pci probe
+
+ add pciids for each subdriver, make no use of the match_data functionality.
+
+ thanks to Alex Deucher for reviewing and testing.
+
+commit 665bd7e2f61cac3e029bbad5024034e5136deec1
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:34:56 2008 +0200
+
+ ati wrapper: translate Device lines
+
+commit a596c1618f72179a45289a50a1f9e89462ce9667
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:34:31 2008 +0200
+
+ r128: do not compile in PciChipsets twice
+
+commit 99cd8ff9a7e15fc2b4e55f8bc020f584173a8c2d
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:33:51 2008 +0200
+
+ ati: drop duplicate pci-id defines
+
+commit 146b01b51069dc227d0b125babb3f6957c9b9de2
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:33:29 2008 +0200
+
+ mach64: clean probe a little
+
+ do not report I/O ports now, they are reported later.
+
+commit f47d461331a032f9bdcf6f63336e848778cec6cc
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 15 18:32:56 2008 +0200
+
+ mach64: minor cosmetic, I2C type
+
+commit 2c66f2e812195167df9ca113044d46deece776ac
+Author: Dave Airlie <airlied at clockmaker.usersys.redhat.com>
+Date: Fri Feb 15 10:59:30 2008 +1000
+
+ make distcheck pass
+
+commit ed87f367ddab7366f84917b43b31d76df4ce1110
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Wed Feb 13 12:53:46 2008 -0500
+
+ RADEON: disable LVDS if panel size is 0x0
+
+ if we can't get the panel size from the bios or edid
+ or a user specified option, assume it's not connected.
+
+commit 422d7f441fdbb318d22d44db661ac9bd61387bd2
+Author: Alex Deucher <alex at cube.(none)>
+Date: Tue Feb 12 15:35:46 2008 -0500
+
+ R6xx: when both crtcs are in use make sure they are both enabled
+
+ sometimes setting a mode on one crtc can cuase a blank screen on the other.
+ make sure they are both enabled if they should be.
+
+commit 860f5af75274cb236f536e1da09da6bd9a579530
+Author: Alex Deucher <alex at cube.(none)>
+Date: Tue Feb 12 14:46:49 2008 -0500
+
+ R6xx: fix up use of bios scratch regs to reflect the new offsets
+
+commit 32f2119b43a0faf6069d8cc0816f0d9f7914c07f
+Author: Alex Deucher <alex at cube.(none)>
+Date: Tue Feb 12 14:20:02 2008 -0500
+
+ R6xx: bios scratch regs moved.
+
+commit 8d64be6ebd7f50d4bcb587afeee8252c1367dc77
+Author: Alex Deucher <alex at samba.(none)>
+Date: Tue Feb 12 12:53:09 2008 -0500
+
+ RADEON: make sure we always set up the FP crtc shadow registers for crtc0
+
+ The behavior changed when I added rmx center mode support. In cases where
+ crtc0 drives a DAC this can lead to a blank screen.
+
+commit 810d192ee046077a894e0fb5f2dfd6a7c0130766
+Author: Alex Deucher <alex at cube.(none)>
+Date: Mon Feb 11 19:23:01 2008 -0500
+
+ R6xx: add missing objects
+
+commit 85043439426e534e561259ce98bebdd8508b36a9
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Mon Feb 11 16:36:58 2008 -0500
+
+ R6xx: make sure we set up the HDP base properly
+
+commit 9ab5d2ec7c583c74f364d7cfbb54bcd2cd8ae2f5
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Mon Feb 11 15:26:51 2008 -0500
+
+ RADEON: always restore crtc1 before crtc0 when using both crtcs
+
+ In some rare cases restoring crtc0 first will result in a blank screen
+ on crtc1. If you are having issues with a blank screen on crtc1
+ that used to work on 6.6.3 or before, this should help.
+
+commit e33edca75bd9df0aa19a33e74c38a6d02610befd
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Mon Feb 11 00:33:12 2008 -0500
+
+ RADEON: Implement proper (hopefully) BIOS/DRIVER interaction for ATOM bios
+
+ Tested on atom-based Desktop cards. It'd nice to get some testing
+ on atom-based laptops.
+
+commit 6524e33435a786f7de0064cdd1b04c1120d21593
+Author: Alex Deucher <alex at botch2.(none)>
+Date: Sun Feb 10 18:52:52 2008 -0500
+
+ RADEON: Implement proper (hopefully) BIOS/DRIVER interaction for COM bios
+
+ Tested on my M10-based laptop.
+
+commit 8606c1bd175893c77e8c758246a1aed166c8be51
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 8 19:07:03 2008 +0200
+
+ mach64: factor out BIOS panel info parsing
+
+commit 9f33218c80f5a6d6d9464aa3db8ae25a4759f351
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 8 19:06:41 2008 +0200
+
+ mach64: minor cosmetic, LCD panel id
+
+commit 8cd5a465a03834b4b2f3a19f8d36fc9d2e18c6d4
+Author: George Sapountzis <gsap7 at yahoo.gr>
+Date: Fri Feb 8 19:06:27 2008 +0200
+
+ mach64: minor cosmetic, DAC type
+
commit 7f4db96123fdcba9874226352802d702c2a498bd
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 8 10:47:10 2008 +1000
@@ -9805,7 +9967,7 @@
+//Without this file, compatibility will be broken among ASICs and BIOs vs. driver
+//James H. Apr. 22/03
diff --git a/src/Makefile.am b/src/Makefile.am
-index 5152577..661dcd8 100644
+index 5152577..a146df3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,6 +32,38 @@ R128_DRI_SRCS = r128_dri.c
@@ -9916,14 +10078,24 @@
atimach64render.c \
radeon_render.c \
radeon_accelfuncs.c \
-@@ -138,7 +175,6 @@ EXTRA_DIST = \
+@@ -137,8 +174,8 @@ EXTRA_DIST = \
+ atimach64i2c.h \
atimach64io.h \
atimach64probe.h \
++ atimach64version.h \
atimode.h \
- atimodule.h \
atioption.h \
atipreinit.h \
atiprint.h \
+@@ -162,7 +199,6 @@ EXTRA_DIST = \
+ mach64_common.h \
[...6241 lines suppressed...]
++ NULL,
++#else
+ RADEONProbe,
++#endif
+ RADEONAvailableOptions,
+ NULL,
-+ 0
++ 0,
++ NULL,
++#ifdef XSERVER_LIBPCIACCESS
++ radeon_device_match,
++ radeon_pci_probe
++#endif
+};
diff --git a/src/radeon_probe.h b/src/radeon_probe.h
-index 7f8ce45..df87dab 100644
+index 7f8ce45..a3cf1fc 100644
--- a/src/radeon_probe.h
+++ b/src/radeon_probe.h
@@ -36,6 +36,7 @@
@@ -34159,7 +36345,7 @@
int dvo_i2c_slave_addr;
Bool dvo_duallink;
/* TV out */
-@@ -222,10 +255,291 @@ typedef struct _RADEONOutputPrivateRec {
+@@ -222,10 +255,298 @@ typedef struct _RADEONOutputPrivateRec {
int SupportedTVStds;
Bool tv_on;
int load_detection;
@@ -34293,9 +36479,16 @@
+ CARD32 cap0_trig_cntl;
+ CARD32 cap1_trig_cntl;
+ CARD32 bus_cntl;
++
++ CARD32 bios_0_scratch;
++ CARD32 bios_1_scratch;
++ CARD32 bios_2_scratch;
++ CARD32 bios_3_scratch;
+ CARD32 bios_4_scratch;
+ CARD32 bios_5_scratch;
+ CARD32 bios_6_scratch;
++ CARD32 bios_7_scratch;
++
+ CARD32 surface_cntl;
+ CARD32 surfaces[8][3];
+ CARD32 mc_agp_location;
@@ -34452,7 +36645,7 @@
typedef struct
{
-@@ -243,17 +557,18 @@ typedef struct
+@@ -243,17 +564,18 @@ typedef struct
xf86CrtcPtr pCrtc[RADEON_MAX_CRTC];
RADEONCrtcPrivatePtr Controller[RADEON_MAX_CRTC];
@@ -34477,10 +36670,82 @@
extern Bool RADEONScreenInit(int, ScreenPtr, int, char **);
extern Bool RADEONSwitchMode(int, DisplayModePtr, int);
diff --git a/src/radeon_reg.h b/src/radeon_reg.h
-index 6e4e383..8d45d7b 100644
+index 6e4e383..61cdb15 100644
--- a/src/radeon_reg.h
+++ b/src/radeon_reg.h
-@@ -337,6 +337,8 @@
+@@ -130,13 +130,71 @@
+
+ #define RADEON_BASE_CODE 0x0f0b
+ #define RADEON_BIOS_0_SCRATCH 0x0010
++# define RADEON_FP_PANEL_SCALABLE (1 << 16)
++# define RADEON_FP_PANEL_SCALE_EN (1 << 17)
++# define RADEON_FP_CHIP_SCALE_EN (1 << 18)
++# define RADEON_DRIVER_BRIGHTNESS_EN (1 << 26)
++# define RADEON_DISPLAY_ROT_MASK (3 << 28)
++# define RADEON_DISPLAY_ROT_00 (0 << 28)
++# define RADEON_DISPLAY_ROT_90 (1 << 28)
++# define RADEON_DISPLAY_ROT_180 (2 << 28)
++# define RADEON_DISPLAY_ROT_270 (3 << 28)
+ #define RADEON_BIOS_1_SCRATCH 0x0014
+ #define RADEON_BIOS_2_SCRATCH 0x0018
+ #define RADEON_BIOS_3_SCRATCH 0x001c
+ #define RADEON_BIOS_4_SCRATCH 0x0020
++# define RADEON_CRT1_ATTACHED_MASK (3 << 0)
++# define RADEON_CRT1_ATTACHED_MONO (1 << 0)
++# define RADEON_CRT1_ATTACHED_COLOR (2 << 0)
++# define RADEON_LCD1_ATTACHED (1 << 2)
++# define RADEON_DFP1_ATTACHED (1 << 3)
++# define RADEON_TV1_ATTACHED_MASK (3 << 4)
++# define RADEON_TV1_ATTACHED_COMP (1 << 4)
++# define RADEON_TV1_ATTACHED_SVIDEO (2 << 4)
++# define RADEON_CRT2_ATTACHED_MASK (3 << 8)
++# define RADEON_CRT2_ATTACHED_MONO (1 << 8)
++# define RADEON_CRT2_ATTACHED_COLOR (2 << 8)
++# define RADEON_DFP2_ATTACHED (1 << 11)
+ #define RADEON_BIOS_5_SCRATCH 0x0024
++# define RADEON_LCD1_ON (1 << 0)
++# define RADEON_CRT1_ON (1 << 1)
++# define RADEON_TV1_ON (1 << 2)
++# define RADEON_DFP1_ON (1 << 3)
++# define RADEON_CRT2_ON (1 << 5)
++# define RADEON_CV1_ON (1 << 6)
++# define RADEON_DFP2_ON (1 << 7)
++# define RADEON_LCD1_CRTC_MASK (1 << 8)
++# define RADEON_LCD1_CRTC_SHIFT 8
++# define RADEON_CRT1_CRTC_MASK (1 << 9)
++# define RADEON_CRT1_CRTC_SHIFT 9
++# define RADEON_TV1_CRTC_MASK (1 << 10)
++# define RADEON_TV1_CRTC_SHIFT 10
++# define RADEON_DFP1_CRTC_MASK (1 << 11)
++# define RADEON_DFP1_CRTC_SHIFT 11
++# define RADEON_CRT2_CRTC_MASK (1 << 12)
++# define RADEON_CRT2_CRTC_SHIFT 12
++# define RADEON_CV1_CRTC_MASK (1 << 13)
++# define RADEON_CV1_CRTC_SHIFT 13
++# define RADEON_DFP2_CRTC_MASK (1 << 14)
++# define RADEON_DFP2_CRTC_SHIFT 14
+ #define RADEON_BIOS_6_SCRATCH 0x0028
++# define RADEON_ACC_MODE_CHANGE (1 << 2)
++# define RADEON_EXT_DESKTOP_MODE (1 << 3)
++# define RADEON_LCD_DPMS_ON (1 << 20)
++# define RADEON_CRT_DPMS_ON (1 << 21)
++# define RADEON_TV_DPMS_ON (1 << 22)
++# define RADEON_DFP_DPMS_ON (1 << 23)
++# define RADEON_DPMS_MASK (3 << 24)
++# define RADEON_DPMS_ON (0 << 24)
++# define RADEON_DPMS_STANDBY (1 << 24)
++# define RADEON_DPMS_SUSPEND (2 << 24)
++# define RADEON_DPMS_OFF (3 << 24)
++# define RADEON_SCREEN_BLANKING (1 << 26)
++# define RADEON_DRIVER_CRITICAL (1 << 27)
++# define RADEON_DISPLAY_SWITCHING_DIS (1 << 30)
+ #define RADEON_BIOS_7_SCRATCH 0x002c
++# define RADEON_SYS_HOTKEY (1 << 10)
++# define RADEON_DRV_LOADED (1 << 12)
+ #define RADEON_BIOS_ROM 0x0f30 /* PCI */
+ #define RADEON_BIST 0x0f0f /* PCI */
+ #define RADEON_BRUSH_DATA0 0x1480
+@@ -337,6 +395,8 @@
# define RADEON_CRTC2_HSYNC_DIS (1 << 28)
# define RADEON_CRTC2_VSYNC_DIS (1 << 29)
#define RADEON_CRTC_MORE_CNTL 0x27c
@@ -34489,7 +36754,7 @@
# define RADEON_CRTC_H_CUTOFF_ACTIVE_EN (1<<4)
# define RADEON_CRTC_V_CUTOFF_ACTIVE_EN (1<<5)
#define RADEON_CRTC_GUI_TRIG_VLINE 0x0218
-@@ -812,6 +814,7 @@
+@@ -812,6 +872,7 @@
# define RADEON_HORZ_AUTO_RATIO (1 << 27)
# define RADEON_HORZ_FP_LOOP_STRETCH (0x7 << 28)
# define RADEON_HORZ_AUTO_RATIO_INC (1 << 31)
@@ -34497,7 +36762,7 @@
#define RADEON_FP_V_SYNC_STRT_WID 0x02c8
#define RADEON_FP_VERT_STRETCH 0x0290
#define RADEON_FP_V2_SYNC_STRT_WID 0x03c8
-@@ -997,6 +1000,7 @@
+@@ -997,6 +1058,7 @@
#define RADEON_MPP_GP_CONFIG 0x01c8 /* ? */
#define R300_MC_IND_INDEX 0x01f8
# define R300_MC_IND_ADDR_MASK 0x3f
@@ -34505,7 +36770,7 @@
#define R300_MC_IND_DATA 0x01fc
#define R300_MC_READ_CNTL_AB 0x017c
# define R300_MEM_RBS_POSITION_A_MASK 0x03
-@@ -3243,9 +3247,9 @@
+@@ -3243,9 +3305,9 @@
#define RADEON_TV_PLL_FINE_CNTL 0x0020 /* PLL */
#define RADEON_TV_PLL_CNTL 0x0021 /* PLL */
# define RADEON_TV_M0LO_MASK 0xff
@@ -34517,7 +36782,7 @@
# define RADEON_TV_N0LO_SHIFT 8
# define RADEON_TV_N0HI_MASK 0x3
# define RADEON_TV_N0HI_SHIFT 21
-@@ -3271,4 +3275,682 @@
+@@ -3271,4 +3333,693 @@
#define RADEON_RS480_UNK_e38 0xe38
#define RADEON_RS480_UNK_e3c 0xe3c
@@ -34989,12 +37254,23 @@
+#define R600_MC_VM_SYSTEM_APERTURE_HIGH_ADDR 0x2194
+#define R600_MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR 0x2198
+
++#define R600_HDP_NONSURFACE_BASE 0x2c04
++
+#define R600_BUS_CNTL 0x5420
+#define R600_CONFIG_CNTL 0x5424
+#define R600_CONFIG_MEMSIZE 0x5428
+#define R600_CONFIG_F0_BASE 0x542C
+#define R600_CONFIG_APER_SIZE 0x5430
+
++#define R600_BIOS_0_SCRATCH 0x1724
++#define R600_BIOS_1_SCRATCH 0x1728
++#define R600_BIOS_2_SCRATCH 0x172c
++#define R600_BIOS_3_SCRATCH 0x1730
++#define R600_BIOS_4_SCRATCH 0x1734
++#define R600_BIOS_5_SCRATCH 0x1738
++#define R600_BIOS_6_SCRATCH 0x173c
++#define R600_BIOS_7_SCRATCH 0x1740
++
+#define R300_GB_TILE_CONFIG 0x4018
+#define R300_GB_SELECT 0x401c
+#define R300_GB_ENABLE 0x4008
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- xorg-x11-drv-ati.spec 8 Feb 2008 04:06:15 -0000 1.80
+++ xorg-x11-drv-ati.spec 17 Feb 2008 23:46:36 -0000 1.81
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.7.197
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -84,6 +84,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Mon Feb 18 2008 Dave Airlie <airlied at redhat.com> 6.7.197-3
+- rebase to upstream git master - lots of r600 fixes
+
* Fri Feb 08 2008 Dave Airlie <airlied at redhat.com> 6.7.197-2
- rebase to upstream git master - add rv67x ids
- Previous message (by thread): rpms/libggz/devel .cvsignore, 1.2, 1.3 libggz.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ggz-client-libs/devel .cvsignore, 1.2, 1.3 ggz-client-libs.spec, 1.3, 1.4 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list