rpms/kernel/devel drm-modesetting-radeon.patch, 1.56, 1.57 drm-nouveau.patch, 1.8, 1.9 kernel.spec, 1.1343, 1.1344
Dave Airlie
airlied at fedoraproject.org
Fri Feb 27 03:05:20 UTC 2009
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12899
Modified Files:
drm-modesetting-radeon.patch drm-nouveau.patch kernel.spec
Log Message:
* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com>
- drm-next.patch: bring in drm-next tree for r600 support
- rebased drm-modesetting-radeon.patch and drm-nouveau.patch
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.56 -r 1.57 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- drm-modesetting-radeon.patch 25 Feb 2009 06:35:23 -0000 1.56
+++ drm-modesetting-radeon.patch 27 Feb 2009 03:05:19 -0000 1.57
@@ -1,23 +1,54 @@
-commit 0f6053741411f3ab78a99470523175f20c56b256
-Author: David Miller <davem at davemloft.net>
-Date: Thu Feb 12 02:15:39 2009 -0800
+commit e92784bff2fee17c8e47f11753343d99500784a6
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 27 11:51:22 2009 +1000
- drm: radeon: Fix RADEON_*_EMITED defines.
-
- These are not supposed to be booleans, they are
- supposed to be bit masks.
+ radeon: fixup proc hacks
+
+commit 8e01de63b0dc4be70fbf8ce33b958d3d4c5d5748
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 27 11:51:08 2009 +1000
+
+ radeon: fixup module load
+
+commit 998fa33e12ba50b16e44ad1add5b82ec11aaacfc
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 27 11:50:50 2009 +1000
+
+ radeon: fix up ring read/write for new drm-next code
+
+commit 84044ac6eb43ebb861b661aad772be350362dfbe
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Feb 27 11:50:24 2009 +1000
+
+ ati_pcigart: update pcigart for changes in drm-next
+
+commit c44d3fa4e174f3aa95ad575e802dd2d01d0615d6
+Author: Dave Airlie <airlied at linux.ie>
+Date: Thu Feb 26 22:27:21 2009 +1000
+
+ radeon: fixup writeback/ring ptrs for Kms
+
+commit 31585bd60335dbc5e6814135add77b2228bdf419
+Author: Dave Airlie <airlied at linux.ie>
+Date: Thu Feb 26 22:00:59 2009 +1000
+
+ radeon: fixup after rebase so it builds
- Signed-off-by: David S. Miller <davem at davemloft.net>
- Signed-off-by: Dave Airlie <airlied at linux.ie>
- (cherry picked from commit c88605574cafb3883011c898d21309b5d93d0d09)
+ lots more to do
+
+commit a9c8c80c07d3e08681cfae325e62be775eb621e2
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Feb 26 12:03:55 2009 +1000
+
+ drm/radeno: add support for r100 cp type 3 packets
-commit d5315273951332ebc92d0a0a32412c98fc3b6bec
+commit 1111b2c28fde03d81663af3a6efa9b362c80189d
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 16:07:15 2009 +1000
radeon: fixup cs buffer re-use code to not block straight away
-commit da53c6edb0b09776687bbf37796b3db3a47192af
+commit 6934826040173ca3022503534b867ba0d0bc7fe3
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 16:06:30 2009 +1000
@@ -25,37 +56,37 @@
Totally missed this before - really helps stability
-commit 5d2a309e5f10266667bc733b884198a2f51cf845
+commit ae76231f773dfc8cfdf86ddfc9c34de604e07968
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 25 13:03:47 2009 +1000
radeon: fix IB dump end
-commit 57f22b7e9781a6d0894af48369c75b0caa6d9a8b
+commit 7ce70adf16692a8b8d34f8ee5018a0b26f99a176
Author: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Date: Tue Feb 24 20:26:53 2009 +1000
drm/ttm: work around some x86 pat oddities by using mixedmap instead of pfnmap
-commit 465937aec83364d3cf516bc8b6c2ca7f785892d9
+commit bc61dd6a56ae8678dd0a68074fce63a9b58f6039
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:22:14 2009 +1000
radeon: add module IDs
-commit dd6dc3d83534ae6ae908629cfe0d1a784e073102
+commit 2cb426ab76242230ee66c62ca56346f20dda7322
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:19:33 2009 +1000
radeon: fixup for new APIs
-commit a93e118253bdf74092233dbc21d3e257688f39c8
+commit a9156df0c323939c6a61fcf4894dc160e71b7178
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Feb 22 08:11:33 2009 +1000
drm: fix parmeter passed to fb_release
-commit 2b6628ce5e481e1ff5a30d8957d7b32fd5b4d1e1
+commit 0260fc0c5544220072074582c40e3807380a40d2
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 17:36:33 2009 +1000
@@ -63,13 +94,13 @@
this adds basic IB dumping and cleans up some code around it.
-commit cb1fedbb2df6da2f104a026c7846dfc91564e2f7
+commit 693ea916ff5f7e94cb766ff3326256304a10c282
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 11:12:19 2009 +1000
radeon: fix packet2 parsing + enhance debug
-commit c3e00f3af01659590ef278d822ef0a727faf4f71
+commit d70737eeb6002581984d34073bcfce246914ee49
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Feb 18 11:11:39 2009 +1000
@@ -80,37 +111,37 @@
It also doesn't or in the table values but sets them
-commit c4c20e2f1e60bb507e1b2c5f1e9d2c26497df171
+commit 5efc94678c2535fa8640d6ff13a382b2de593175
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Feb 17 20:57:34 2009 +1000
radeon/i2c: i2c adapter id is gone
-commit c15cf36a1ecd6ddc99c453d4fbf0b88a812c8f72
+commit 06f9316ec64614270971e9f383da9841097c6897
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jan 22 17:15:56 2009 +1000
drm: fix radeon Kconfig
-commit 36e00f39abecac799b7d53122e35ec1098245c45
+commit 6185b5baf2dea5433b9bea369e0303641c12a397
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Jan 11 19:50:23 2009 +1000
radeon: add missing Kconfig text
-commit d7d278645bf22fa609a3442bd105539e67977f39
+commit 5da904a88e52d5fa0ed88f0711e5901e150185f4
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Jan 11 19:47:39 2009 +1000
drm: fix merge issue that messes up irq
-commit cad74b7853b75c0e10b2958d933518921e194265
+commit c8f0b003060f81347b5efd95f6b9ea61896e823c
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Jan 10 12:40:42 2009 +1000
radeon: add getparam to get pci device from userspace
-commit 97859845b7216b86003a1bb0533d1f5cf43a0c04
+commit 0dd95dc27b9e1b4734a07ffdb3edef67069f9743
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Dec 18 23:01:12 2008 +1000
@@ -119,49 +150,49 @@
This should make AGP no corrupt itself to all buggery
(cherry picked from commit 55c0a3f1d3693cb5c3b65f37d4bb6e8a3c025460)
-commit 5b1ded493702a6807d0e6718fe17a78b573cdd36
+commit e08687047ae2904ad9a7f18d5c4a0ccae29727d3
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 2 16:38:04 2008 +1000
drop old CS
-commit 5a569665167ed400fbef07ff5ce6fb106a2d3576
+commit 00a936a692a1ff6bf365f0af46afc9e828fb989f
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Dec 1 15:09:27 2008 +1000
radeon: update with latest CS bits
-commit 19518b82b4fc4fb0b2093efb29658e36169b7c0a
+commit 95af07dde6539c225de4209c05db273e880ea576
Author: Dave Airlie <airlied at redhat.com>
[...3579 lines suppressed...]
}
break;
case RADEON_SETPARAM_PCIGART_LOCATION:
@@ -35150,7 +35062,7 @@
dev_priv->gart_info.table_size = sp->value;
if (dev_priv->gart_info.table_size < RADEON_PCIGART_TABLE_SIZE)
dev_priv->gart_info.table_size = RADEON_PCIGART_TABLE_SIZE;
-@@ -3127,6 +3153,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3137,6 +3163,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
case RADEON_SETPARAM_VBLANK_CRTC:
return radeon_vblank_crtc_set(dev, sp->value);
break;
@@ -35165,7 +35077,7 @@
default:
DRM_DEBUG("Invalid parameter %d\n", sp->param);
return -EINVAL;
-@@ -3215,7 +3249,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3226,7 +3260,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
DRM_IOCTL_DEF(DRM_RADEON_IRQ_WAIT, radeon_irq_wait, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SETPARAM, radeon_cp_setparam, DRM_AUTH),
DRM_IOCTL_DEF(DRM_RADEON_SURF_ALLOC, radeon_surface_alloc, DRM_AUTH),
@@ -35199,7 +35111,7 @@
/**
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index e5f4ae9..c963f25 100644
+index ccbcd13..99e348d 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -147,9 +147,23 @@ struct drm_device;
@@ -35226,7 +35138,7 @@
/*@}*/
-@@ -652,6 +666,8 @@ struct drm_master {
+@@ -665,6 +679,8 @@ struct drm_master {
void *driver_priv; /**< Private structure for driver to use */
};
@@ -35235,7 +35147,7 @@
/**
* DRM driver structure. This structure represent the common code for
* a family of cards. There will one drm_device for each card present
-@@ -770,6 +786,8 @@ struct drm_driver {
+@@ -784,6 +800,8 @@ struct drm_driver {
/* Driver private ops for this object */
struct vm_operations_struct *gem_vm_ops;
@@ -35244,7 +35156,7 @@
int major;
int minor;
-@@ -845,7 +863,10 @@ struct drm_device {
+@@ -906,7 +924,10 @@ struct drm_device {
/*@{ */
struct list_head maplist; /**< Linked list of regions */
int map_count; /**< Number of mappable regions */
@@ -35256,7 +35168,7 @@
/** \name Context handle management */
/*@{ */
-@@ -856,6 +877,7 @@ struct drm_device {
+@@ -917,6 +938,7 @@ struct drm_device {
struct idr ctx_idr;
struct list_head vmalist; /**< List of vmas (for debugging) */
@@ -35264,7 +35176,7 @@
/*@} */
-@@ -927,7 +949,6 @@ struct drm_device {
+@@ -988,7 +1010,6 @@ struct drm_device {
int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
void *mm_private;
@@ -35272,7 +35184,7 @@
struct drm_sigdata sigdata; /**< For block_all_signals */
sigset_t sigmask;
-@@ -937,6 +958,9 @@ struct drm_device {
+@@ -998,6 +1019,9 @@ struct drm_device {
struct drm_minor *control; /**< Control node for card */
struct drm_minor *primary; /**< render type primary screen head */
@@ -35282,7 +35194,7 @@
/** \name Drawable information */
/*@{ */
spinlock_t drw_lock;
-@@ -959,8 +983,28 @@ struct drm_device {
+@@ -1020,8 +1044,28 @@ struct drm_device {
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
/*@} */
@@ -35311,7 +35223,7 @@
static inline int drm_dev_to_irq(struct drm_device *dev)
{
-@@ -1070,6 +1114,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+@@ -1131,6 +1175,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
uint32_t type);
extern int drm_unbind_agp(DRM_AGP_MEM * handle);
@@ -35329,7 +35241,7 @@
/* Misc. IOCTL support (drm_ioctl.h) */
extern int drm_irq_by_busid(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-@@ -1240,6 +1295,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
+@@ -1301,6 +1356,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
extern int drm_agp_free_memory(DRM_AGP_MEM * handle);
extern int drm_agp_bind_memory(DRM_AGP_MEM * handle, off_t start);
extern int drm_agp_unbind_memory(DRM_AGP_MEM * handle);
@@ -35337,7 +35249,7 @@
extern void drm_agp_chipset_flush(struct drm_device *dev);
/* Stub support (drm_stub.h) */
-@@ -1281,6 +1337,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1368,6 +1424,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
struct drm_ati_pcigart_info * gart_info);
extern int drm_ati_pcigart_cleanup(struct drm_device *dev,
struct drm_ati_pcigart_info * gart_info);
@@ -35346,7 +35258,7 @@
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align, dma_addr_t maxaddr);
-@@ -1438,6 +1496,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1525,6 +1583,39 @@ extern void drm_free(void *pt, size_t size, int area);
extern void *drm_calloc(size_t nmemb, size_t size, int area);
#endif
@@ -35387,10 +35299,10 @@
#endif /* __KERNEL__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 0b0d236..cb3952c 100644
+index c7d4b2e..3091fc3 100644
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
-@@ -121,4 +121,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
+@@ -122,4 +122,6 @@ static inline void drm_connector_helper_add(struct drm_connector *connector,
}
extern int drm_helper_resume_force_mode(struct drm_device *dev);
@@ -36349,10 +36261,10 @@
* on the security mechanisms provided by hardware.
*/
diff --git a/include/drm/radeon_drm.h b/include/drm/radeon_drm.h
-index 73ff51f..1f67a11 100644
+index 937a275..f716e0a 100644
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
-@@ -453,6 +453,15 @@ typedef struct {
+@@ -455,6 +455,15 @@ typedef struct {
int pfCurrentPage; /* which buffer is being displayed? */
int crtc2_base; /* CRTC2 frame offset */
int tiling_enabled; /* set by drm, read by 2d + 3d clients */
@@ -36368,7 +36280,7 @@
} drm_radeon_sarea_t;
/* WARNING: If you change any of these defines, make sure to change the
-@@ -493,6 +502,18 @@ typedef struct {
+@@ -495,6 +504,18 @@ typedef struct {
#define DRM_RADEON_SURF_ALLOC 0x1a
#define DRM_RADEON_SURF_FREE 0x1b
@@ -36387,7 +36299,7 @@
#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 {
+@@ -523,6 +544,18 @@ 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)
@@ -36406,7 +36318,7 @@
typedef struct drm_radeon_init {
enum {
RADEON_INIT_CP = 0x01,
-@@ -677,6 +710,8 @@ typedef struct drm_radeon_indirect {
+@@ -680,6 +713,8 @@ 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 */
@@ -36415,7 +36327,7 @@
typedef struct drm_radeon_getparam {
int param;
-@@ -731,6 +766,7 @@ typedef struct drm_radeon_setparam {
+@@ -734,6 +769,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 */
@@ -36423,7 +36335,7 @@
/* 1.14: Clients can allocate/free a surface
*/
typedef struct drm_radeon_surface_alloc {
-@@ -746,4 +782,106 @@ typedef struct drm_radeon_surface_free {
+@@ -749,4 +785,106 @@ typedef struct drm_radeon_surface_free {
#define DRM_RADEON_VBLANK_CRTC1 1
#define DRM_RADEON_VBLANK_CRTC2 2
drm-nouveau.patch:
Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-nouveau.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- drm-nouveau.patch 11 Feb 2009 04:35:13 -0000 1.8
+++ drm-nouveau.patch 27 Feb 2009 03:05:19 -0000 1.9
@@ -31,7 +31,7 @@
EXPORT_SYMBOL(drm_get_resource_len);
-static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
-- drm_local_map_t *map)
+- struct drm_local_map *map)
+struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
+ drm_local_map_t *map)
{
@@ -45,11 +45,11 @@
static int drm_map_handle(struct drm_device *dev, struct drm_hash_item *hash,
unsigned long user_token, int hashed_handle)
-diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
+diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index c6ade45..969b372 100644
---- a/drivers/gpu/drm/drm_drv.c
-+++ b/drivers/gpu/drm/drm_drv.c
-@@ -327,11 +327,10 @@ static void drm_cleanup(struct drm_device * dev)
+--- a/drivers/gpu/drm/drm_stub.c
++++ b/drivers/gpu/drm/drm_stub.c
+@@ -327,11 +327,10 @@ void drm_put_dev(struct drm_device * dev)
dev->agp = NULL;
}
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1343
retrieving revision 1.1344
diff -u -r1.1343 -r1.1344
--- kernel.spec 26 Feb 2009 23:50:03 -0000 1.1343
+++ kernel.spec 27 Feb 2009 03:05:19 -0000 1.1344
@@ -642,9 +642,10 @@
Patch1550: linux-2.6-cdrom-door-status.patch
# nouveau + drm fixes
+Patch1811: drm-next.patch
Patch1812: drm-modesetting-radeon.patch
Patch1814: drm-nouveau.patch
-Patch1815: drm-intel-next.patch
+#Patch1815: drm-intel-next.patch
Patch1816: drm-no-gem-on-i8xx.patch
Patch1818: drm-i915-resume-force-mode.patch
@@ -1174,7 +1175,7 @@
ApplyPatch linux-2.6-libertas-netpriv-fixes.patch
# Nouveau DRM + drm fixes
-#ApplyPatch drm-next.patch
+ApplyPatch drm-next.patch
ApplyPatch drm-modesetting-radeon.patch
ApplyPatch drm-nouveau.patch
#ApplyPatch drm-intel-next.patch
@@ -1785,6 +1786,10 @@
# and build.
%changelog
+* Fri Feb 27 2009 Dave Airlie <airlied at redhat.com>
+- drm-next.patch: bring in drm-next tree for r600 support
+- rebased drm-modesetting-radeon.patch and drm-nouveau.patch
+
* Thu Feb 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.163.rc6.git3
- Add support for sharing source trees between CVS checkouts.
More information about the fedora-extras-commits
mailing list