rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.69, 1.70 kernel.spec, 1.1222, 1.1223 drm-next.patch, 1.11, NONE
Dave Airlie
airlied at fedoraproject.org
Tue Jan 20 05:11:52 UTC 2009
- Previous message (by thread): rpms/rubygem-nokogiri/devel rubygem-nokogiri.spec, NONE, 1.1 jd.spec, 1.1, NONE
- Next message (by thread): rpms/cairo-dock/devel .cvsignore, 1.102, 1.103 cairo-dock.spec, 1.138, 1.139 sources, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20032
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Removed Files:
drm-next.patch
Log Message:
* Tue Jan 20 2009 Dave Airlie <airlied at redhat.com> 2.6.28.1-16
- rebase radeon modesetting onto 2.6.28
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.69 -r 1.70 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- drm-modesetting-radeon.patch 12 Jan 2009 19:51:27 -0000 1.69
+++ drm-modesetting-radeon.patch 20 Jan 2009 05:11:51 -0000 1.70
@@ -1,55 +1,42 @@
-commit 3ef2b914f9667c70a9711fa31ff95d639ccc8e2e
+commit ea9f35fbb0ad27833bb78e29d1118516855fb819
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Dec 19 11:01:33 2008 +1000
+
+ drm: fix problem with master enable
+
+commit 6361ff89314f0e48c6a70c71f836bcfe2a1083ee
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 18 23:01:12 2008 +1000
drm: don't set cached bits on pages from uncached allocator.
This should make AGP no corrupt itself to all buggery
- (cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
-
-commit be5f7447cc492545e225170be38e5e65d7de37d9
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Dec 2 16:38:04 2008 +1000
-
- drop old CS
-
-commit 91bfed87127c1bd17098803184e43783d55f35e5
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Dec 1 15:09:27 2008 +1000
- radeon: update with latest CS bits
-
-commit a7f6175e3610651b1f84a1b8aa1f61a9a4f3bdb6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Dec 17 06:56:36 2008 +1000
-
- fixups post rebase
-
-commit cd29f247278a5949956adbfb75229dc9bad19f8e
+commit 353c7a5dbb898188407d8e54fd6983a2006b16ad
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 11 01:35:09 2008 +1000
radeon: fix agp mode when kms isn't enabled
-commit 0d0f9c970263750a68131b5f88735c59f605c69f
+commit 017e784508024b64217d0d4e31aa580261d83331
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 17:22:07 2008 +1100
radeon: add support for accessing disabled ROMs.
-commit 840d823d6f33c1852b92791093b23b1ce7af25ac
+commit d3c95991acabea7873a6675a6ff6d386465cf4c3
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 17:19:02 2008 +1100
radeon: make cail do pll read/write via actual PLL functions
-commit 049d865d47cf229234cd7dd0ef8927a41a142b0e
+commit b842e47ab42035dad7a521b2fc8c6105c7208151
Author: Dave Airlie <airlied at ppcg5.localdomain>
Date: Wed Dec 3 16:36:00 2008 +1100
radeon: atom fixes for endianness
-commit df08dc63cbbd19a8ea0659bdc379147a59201b4c
+commit d948ab5e334cb9046fade3fefac793efc1290699
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Dec 3 20:28:05 2008 +1000
@@ -59,7 +46,7 @@
Limit the AGP aperture to the GART size, and init the registers
in the right place
-commit 79d6ac96108c29dbce90ce605b01dd6b71673092
+commit 60a11e6a15441b1d67d09965fa389ba0373b7acd
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 2 12:49:17 2008 +1000
@@ -68,7 +55,7 @@
1. Proper PCIE fallback on PCIE cards.
2. Setup agp base + location regs properly
-commit e6a1353d11f485c99371e0b89c669da0c23e8af4
+commit 39106b8526ff66acdb2076b4623cd2bea3d28c76
Author: Michal Schmidt <mschmidt at redhat.com>
Date: Tue Dec 2 08:06:59 2008 +1000
@@ -76,13 +63,21 @@
fedora bz 473895
-commit d879f36aca29ece7c3bfada452266e82df3f2392
+commit aaa952a952eb64206b29d61ccc128298a45d9c2b
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 28 09:19:47 2008 +1000
+
+ drm: cleanup exit path mess using a linked list.
+
+ Just keep a list of devices per driver and cleanup on exit
+
+commit 0dfc2a5fffbd76713ddbbb7c126294d08c1b30e0
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 27 17:14:40 2008 +1000
radeon: post any GPUs that aren't posted
-commit d04c4750aba2b0bd306ab36a0002f2609ed6cc9a
+commit c9f53c74f29866a2fadddf3b707919234fad4b80
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 15:18:31 2008 +1000
@@ -93,13 +88,13 @@
Default to 512MB gart.
-commit ae7c33fa98bf4921292f6dffb6e60dd2b85cddfa
+commit 7a6f7c80bae14c04a65ed4928f57f7de2b600cf3
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 15:17:49 2008 +1000
radeon: add some missing feature checks for modesetting
-commit 54fd140cc8c63d5c65fbcdf21259025fd8a431e8
+commit 5465b46ca8abfeb61f39b8b1ca538f04b8e2fe7b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 24 11:41:06 2008 +1100
@@ -108,43 +103,49 @@
we really need to read back to make sure the invalidate has happened
before continuing along happily in life.
-commit 5e418cef1bfca7e8e0821d6e44a1e1a78e015b17
+commit b45ca3c31577279e17e17ccd1540c90400d175ac
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 23 19:19:02 2008 +1000
drm: we have discardable now so don't do special cases
-commit 87e2de7aef77b96a8be3532358b6ceb9540d622a
+commit bdedddaf3f368728f377d32bf937bb03f35c7ba4
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 21 14:52:25 2008 +1000
atom: fix bug in parser for MC reads
-commit 52eccc11083a1c0636337520187a4e2cf9bfe989
+commit a992cf31c94ac486eb8405952161d2502f417a44
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 18:14:28 2008 +1000
radeon: turn of VRAM zeroing by default for now - needs work
-commit 7a32efbc88ed749c0cd44a95bb4888cd2bc806c0
+commit 81c801b34d01255649ef2bc231f43e7344d6ff90
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 17 16:59:00 2008 +1000
+
+ drm: make 800x600 be standard not 640x480
+
+commit 81e18dc62a8f0469f1ed04f694fc814a65ed72dd
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:36 2008 +1000
radeon: fix return value for no relocs
-commit 5a47b4d8a97949288ebe8f2f3437637e405d1db8
+commit 6054ddc84d750bb70874f4f1dcd0cd3abd8a3967
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:01 2008 +1000
ttm: add discard for VRAM buffers
-commit 160794bbbb90088a86acc96ca5268bc46255582d
+commit 38294b6249209590c1a6ec58918d667059b74fbf
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:52:32 2008 +1000
drm: fix the exit path of the bo unlocking
-commit 1ea46b5e3dc7e75afe1936594e0e085c9dc8665d
+commit 61326321f05996df4a7f5c99448e381ae7f040f0
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:51:44 2008 +1000
@@ -152,49 +153,55 @@
Fixup failure paths and make EAGAIN work
-commit e16a76e302eba9b53858457054059985ec0ef9df
+commit d02319fbc7734c82c596528c77df5e4fde8d1903
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 13 17:22:26 2008 +1100
[...13165 lines suppressed...]
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+-#define SAREA_MAX 0x2000
++#define SAREA_MAX 0x2000UL
+ #elif defined(__ia64__)
+-#define SAREA_MAX 0x10000 /* 64kB */
++#define SAREA_MAX 0x10000UL /* 64kB */
+ #else
+ /* Intel 830M driver needs at least 8k SAREA */
+-#define SAREA_MAX 0x2000
++#define SAREA_MAX 0x2000UL
+ #endif
+
+ /** Maximum number of drawables in the SAREA */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index b3bcf72..181d9de 100644
+index 152b34d..13c91fc 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
-@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
+@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
+ unsigned int chipset;
+ } drm_i915_init_t;
+
+-typedef struct _drm_i915_sarea {
++typedef struct drm_i915_sarea {
+ struct drm_tex_region texList[I915_NR_TEX_REGIONS + 1];
+ int last_upload; /* last time texture was uploaded */
+ int last_enqueue; /* last time a buffer was enqueued */
+@@ -105,14 +105,26 @@ typedef struct _drm_i915_sarea {
+ unsigned int rotated_tiled;
+ unsigned int rotated2_tiled;
+
+- int pipeA_x;
+- int pipeA_y;
+- int pipeA_w;
+- int pipeA_h;
+- int pipeB_x;
+- int pipeB_y;
+- int pipeB_w;
+- int pipeB_h;
++ int planeA_x;
++ int planeA_y;
++ int planeA_w;
++ int planeA_h;
++ int planeB_x;
++ int planeB_y;
++ int planeB_w;
++ int planeB_h;
++
++ /* triple buffering - not in kernel */
++ drm_handle_t third_handle;
++ int third_offset;
++ int third_size;
++ unsigned int third_tiled;
++
++ /* buffer object handles for static buffers */
++ unsigned int front_bo_handle;
++ unsigned int back_bo_handle;
++ unsigned int third_bo_handle;
++ unsigned int depth_bo_handle;
+ } drm_i915_sarea_t;
+
+ /* Flags for perf_boxes
+@@ -163,7 +175,7 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
#define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -36034,7 +45303,16 @@
#define DRM_IOCTL_I915_BATCHBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
#define DRM_IOCTL_I915_IRQ_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
#define DRM_IOCTL_I915_IRQ_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
-@@ -220,6 +220,18 @@ typedef struct _drm_i915_sarea {
+@@ -177,6 +189,8 @@ typedef struct _drm_i915_sarea {
+ #define DRM_IOCTL_I915_SET_VBLANK_PIPE DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
+ #define DRM_IOCTL_I915_GET_VBLANK_PIPE DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
+ #define DRM_IOCTL_I915_VBLANK_SWAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
++#define DRM_IOCTL_I915_GEM_INIT DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_INIT, struct drm_i915_gem_init)
++#define DRM_IOCTL_I915_GEM_EXECBUFFER DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)
+ #define DRM_IOCTL_I915_GEM_PIN DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)
+ #define DRM_IOCTL_I915_GEM_UNPIN DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin)
+ #define DRM_IOCTL_I915_GEM_BUSY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)
+@@ -193,10 +207,22 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
#define DRM_IOCTL_I915_GEM_GET_APERTURE DRM_IOR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_APERTURE, struct drm_i915_gem_get_aperture)
@@ -36053,8 +45331,13 @@
/* Allow drivers to submit batchbuffers directly to hardware, relying
* on the security mechanisms provided by hardware.
*/
+-typedef struct _drm_i915_batchbuffer {
++typedef struct drm_i915_batchbuffer {
+ int start; /* agp offset */
+ int used; /* nr bytes in use */
+ int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..e4f5897 100644
+index 73ff51f..770f6f0 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
@@ -453,6 +453,15 @@ typedef struct {
@@ -36073,7 +45356,7 @@
} drm_radeon_sarea_t;
/* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,18 @@ typedef struct {
+@@ -493,6 +502,19 @@ typedef struct {
#define DRM_RADEON_SURF_ALLOC 0x1a
#define DRM_RADEON_SURF_FREE 0x1b
@@ -36087,12 +45370,13 @@
+#define DRM_RADEON_GEM_SET_DOMAIN 0x23
+#define DRM_RADEON_GEM_WAIT_RENDERING 0x24
+
-+#define DRM_RADEON_CS 0x26
++#define DRM_RADEON_CS 0x25
++#define DRM_RADEON_CS2 0x26
+
#define DRM_IOCTL_RADEON_CP_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_INIT, drm_radeon_init_t)
#define DRM_IOCTL_RADEON_CP_START DRM_IO( DRM_COMMAND_BASE + DRM_RADEON_CP_START)
#define DRM_IOCTL_RADEON_CP_STOP DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_CP_STOP, drm_radeon_cp_stop_t)
-@@ -521,6 +542,18 @@ typedef struct {
+@@ -521,6 +543,19 @@ typedef struct {
#define DRM_IOCTL_RADEON_SURF_ALLOC DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_ALLOC, drm_radeon_surface_alloc_t)
#define DRM_IOCTL_RADEON_SURF_FREE DRM_IOW( DRM_COMMAND_BASE + DRM_RADEON_SURF_FREE, drm_radeon_surface_free_t)
@@ -36106,12 +45390,13 @@
+#define DRM_IOCTL_RADEON_GEM_SET_DOMAIN DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_GEM_SET_DOMAIN, struct drm_radeon_gem_set_domain)
+#define DRM_IOCTL_RADEON_GEM_WAIT_RENDERING DRM_IOW(DRM_COMMAND_BASE + DRM_RADEON_GEM_WAIT_RENDERING, struct drm_radeon_gem_wait_rendering)
+#define DRM_IOCTL_RADEON_CS DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS, struct drm_radeon_cs)
++#define DRM_IOCTL_RADEON_CS2 DRM_IOWR(DRM_COMMAND_BASE + DRM_RADEON_CS2, struct drm_radeon_cs2)
+
+
typedef struct drm_radeon_init {
enum {
RADEON_INIT_CP = 0x01,
-@@ -677,6 +710,7 @@ typedef struct drm_radeon_indirect {
+@@ -677,6 +712,7 @@ typedef struct drm_radeon_indirect {
#define RADEON_PARAM_VBLANK_CRTC 13 /* VBLANK CRTC */
#define RADEON_PARAM_FB_LOCATION 14 /* FB location */
#define RADEON_PARAM_NUM_GB_PIPES 15 /* num GB pipes */
@@ -36119,7 +45404,7 @@
typedef struct drm_radeon_getparam {
int param;
-@@ -731,6 +765,7 @@ typedef struct drm_radeon_setparam {
+@@ -731,6 +767,7 @@ typedef struct drm_radeon_setparam {
#define RADEON_SETPARAM_NEW_MEMMAP 4 /* Use new memory map */
#define RADEON_SETPARAM_PCIGART_TABLE_SIZE 5 /* PCI GART Table Size */
#define RADEON_SETPARAM_VBLANK_CRTC 6 /* VBLANK CRTC */
@@ -36127,7 +45412,7 @@
/* 1.14: Clients can allocate/free a surface
*/
typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +781,106 @@ typedef struct drm_radeon_surface_free {
+@@ -746,4 +783,114 @@ typedef struct drm_radeon_surface_free {
#define DRM_RADEON_VBLANK_CRTC1 1
#define DRM_RADEON_VBLANK_CRTC2 2
@@ -36215,6 +45500,14 @@
+
+/* New interface which obsolete all previous interface.
+ */
++
++
++struct drm_radeon_cs {
++ uint32_t dwords;
++ uint32_t cs_id;
++ uint64_t packets;
++};
++
+#define RADEON_CHUNK_ID_RELOCS 0x01
+#define RADEON_CHUNK_ID_IB 0x02
+#define RADEON_CHUNK_ID_OLD 0xff
@@ -36225,7 +45518,7 @@
+ uint64_t chunk_data;
+};
+
-+struct drm_radeon_cs {
++struct drm_radeon_cs2 {
+ uint32_t num_chunks;
+ uint32_t cs_id;
+ uint64_t chunks; /* this points to uint64_t * which point to
@@ -36234,3 +45527,16 @@
+
+
#endif
+diff --git a/include/linux/console.h b/include/linux/console.h
+index 248e6e3..a67a90c 100644
+--- a/include/linux/console.h
++++ b/include/linux/console.h
+@@ -153,4 +153,8 @@ void vcs_remove_sysfs(struct tty_struct *tty);
+ #define VESA_HSYNC_SUSPEND 2
+ #define VESA_POWERDOWN 3
+
++#ifdef CONFIG_VGA_CONSOLE
++extern bool vgacon_text_force(void);
++#endif
++
+ #endif /* _LINUX_CONSOLE_H */
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1222
retrieving revision 1.1223
diff -u -r1.1222 -r1.1223
--- kernel.spec 20 Jan 2009 00:11:24 -0000 1.1222
+++ kernel.spec 20 Jan 2009 05:11:51 -0000 1.1223
@@ -644,7 +644,6 @@
Patch1550: linux-2.6-cdrom-door-status.patch
# nouveau + drm fixes
-Patch1811: drm-next.patch
Patch1812: drm-modesetting-radeon.patch
Patch1814: drm-nouveau.patch
@@ -1185,7 +1184,6 @@
ApplyPatch linux-2.6-serial.patch
# Nouveau DRM + drm fixes
-ApplyPatch drm-next.patch
ApplyPatch drm-modesetting-radeon.patch
ApplyPatch drm-nouveau.patch
@@ -1781,6 +1779,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Tue Jan 20 2009 Dave Airlie <airlied at redhat.com> 2.6.28.1-16
+- rebase radeon modesetting onto 2.6.28
+
* Mon Jan 19 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.28.1-15
- CONFIG_CGROUP_MEM_RES_CTLR=y: the overhead for this option is minimal now
--- drm-next.patch DELETED ---
- Previous message (by thread): rpms/rubygem-nokogiri/devel rubygem-nokogiri.spec, NONE, 1.1 jd.spec, 1.1, NONE
- Next message (by thread): rpms/cairo-dock/devel .cvsignore, 1.102, 1.103 cairo-dock.spec, 1.138, 1.139 sources, 1.102, 1.103
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list