rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.71, 1.72 kernel.spec, 1.1272, 1.1273
Chuck Ebbert
cebbert at fedoraproject.org
Mon Feb 23 16:22:25 UTC 2009
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2969
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Log Message:
Re-enable drm-modesetting-radeon.
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.71 -r 1.72 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.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- drm-modesetting-radeon.patch 29 Jan 2009 21:14:11 -0000 1.71
+++ drm-modesetting-radeon.patch 23 Feb 2009 16:22:24 -0000 1.72
@@ -1,5 +1,1392 @@
+commit 465937aec83364d3cf516bc8b6c2ca7f785892d9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 22 08:22:14 2009 +1000
+
+ radeon: add module IDs
+
+commit dd6dc3d83534ae6ae908629cfe0d1a784e073102
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Feb 22 08:19:33 2009 +1000
+
+ radeon: fixup for new APIs
+
+commit a93e118253bdf74092233dbc21d3e257688f39c8
+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
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 17:36:33 2009 +1000
+
+ radeon: add IB dumping
+
+ this adds basic IB dumping and cleans up some code around it.
+
+commit cb1fedbb2df6da2f104a026c7846dfc91564e2f7
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 11:12:19 2009 +1000
+
+ radeon: fix packet2 parsing + enhance debug
+
+commit c3e00f3af01659590ef278d822ef0a727faf4f71
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Feb 18 11:11:39 2009 +1000
+
+ radeon: use r100/r200 table to setup the regs database
+
+ This takes the packet table from the older CS method and re-uses it to
+ setup the valid register table.
+
+ It also doesn't or in the table values but sets them
+
+commit c4c20e2f1e60bb507e1b2c5f1e9d2c26497df171
+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
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Jan 22 17:15:56 2009 +1000
+
+ drm: fix radeon Kconfig
+
+commit 36e00f39abecac799b7d53122e35ec1098245c45
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Jan 11 19:50:23 2009 +1000
+
+ radeon: add missing Kconfig text
+
+commit d7d278645bf22fa609a3442bd105539e67977f39
+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
+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
+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 5b1ded493702a6807d0e6718fe17a78b573cdd36
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 2 16:38:04 2008 +1000
+
+ drop old CS
+
+commit 5a569665167ed400fbef07ff5ce6fb106a2d3576
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Dec 1 15:09:27 2008 +1000
+
+ radeon: update with latest CS bits
+
+commit 19518b82b4fc4fb0b2093efb29658e36169b7c0a
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Dec 17 06:56:36 2008 +1000
+
+ fixups post rebase
+
+commit 2d40852fce298ef27f2983a5d3aa0259ab3c0022
+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 3ca5ac03d32dd106a652e67e04a1533080d382fd
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date: Wed Dec 3 17:22:07 2008 +1100
+
+ radeon: add support for accessing disabled ROMs.
+
+commit 7feff055f6dd69201505898686144566e461699b
+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 51ccfff5621d1bc8fa5f9d29e623419611d9ebbf
+Author: Dave Airlie <airlied at ppcg5.localdomain>
+Date: Wed Dec 3 16:36:00 2008 +1100
+
+ radeon: atom fixes for endianness
+
+commit a56d542d3bc3e151abebeb64db70020efd7bf36b
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Dec 3 20:28:05 2008 +1000
+
+ radeon: AGP fixes round 2.
+
+ More I can't believe its not AGP fixes.
+ Limit the AGP aperture to the GART size, and init the registers
+ in the right place
+
+commit e651a3391488cb624ee8b257515e47cebdf90257
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 2 12:49:17 2008 +1000
+
+ radeon: AGP fixes
+
+ 1. Proper PCIE fallback on PCIE cards.
+ 2. Setup agp base + location regs properly
+
+commit 3ceed970f283dab225effb8b417737ea4c10a423
+Author: Michal Schmidt <mschmidt at redhat.com>
+Date: Tue Dec 2 08:06:59 2008 +1000
+
+ radeon: fix IGP GART calcs
+
+ fedora bz 473895
+
+commit e6c5860714ad7602794893c052bf72fbf446ccf9
+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 8b6b8aa9a5f5ed6f8b93fedf8e02e8eca5893a3d
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 24 15:18:31 2008 +1000
+
+ radeon: enable larger GART size on PCIE/IGP
+
+ Allocate a larger GART on PCIE and IGP chipsets controlled by the gart_size
+ command line option.
+
+ Default to 512MB gart.
+
+commit dd3c2dd42b25eca9e0a4ac9a2dc35492c2e1f8a9
+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 fd01f4996e6110403a4214b23f6a17a81401ed8e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 24 11:41:06 2008 +1100
+
+ radeon: make rs480/rs690 gart invalidate work properly.
+
+ we really need to read back to make sure the invalidate has happened
+ before continuing along happily in life.
+
+commit 0043eedf0bf9f51e1de33127e87ff23be4a69ccb
+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 65fbc52a61382d0ce9dd60414292f7596faa33ce
+Author: Dave Airlie <airlied at redhat.com>
[...2587 lines suppressed...]
@@ -33454,7 +35018,18 @@
radeon_cp_dispatch_swap(dev, file_priv->master);
sarea_priv->ctx_owner = 0;
-@@ -2872,7 +2882,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
+@@ -2603,8 +2609,8 @@ static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
+ if (id >= RADEON_MAX_STATE_PACKETS)
+ return -EINVAL;
+
+- sz = packet[id].len;
+- reg = packet[id].start;
++ sz = radeon_packet[id].len;
++ reg = radeon_packet[id].start;
+
+ if (sz * sizeof(int) > cmdbuf->bufsz) {
+ DRM_ERROR("Packet size provided larger than data provided\n");
+@@ -2872,7 +2878,7 @@ static int radeon_cp_cmdbuf(struct drm_device *dev, void *data, struct drm_file
orig_nbox = cmdbuf->nbox;
@@ -33463,7 +35038,7 @@
int temp;
temp = r300_do_cp_cmdbuf(dev, file_priv, cmdbuf);
-@@ -3071,6 +3081,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3071,6 +3077,12 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
case RADEON_PARAM_NUM_GB_PIPES:
value = dev_priv->num_gb_pipes;
break;
@@ -33476,7 +35051,7 @@
default:
DRM_DEBUG("Invalid parameter %d\n", param->param);
return -EINVAL;
-@@ -3093,11 +3109,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3093,11 +3105,17 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
switch (sp->param) {
case RADEON_SETPARAM_FB_LOCATION:
@@ -33494,7 +35069,7 @@
if (sp->value == 0) {
DRM_DEBUG("color tiling disabled\n");
dev_priv->front_pitch_offset &= ~RADEON_DST_TILE_MACRO;
-@@ -3113,13 +3135,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3113,13 +3131,21 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
}
break;
case RADEON_SETPARAM_PCIGART_LOCATION:
@@ -33516,7 +35091,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 +3157,14 @@ static int radeon_cp_setparam(struct drm_device *dev, void *data, struct drm_fil
+@@ -3127,6 +3153,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;
@@ -33531,7 +35106,7 @@
default:
DRM_DEBUG("Invalid parameter %d\n", sp->param);
return -EINVAL;
-@@ -3215,7 +3253,19 @@ struct drm_ioctl_desc radeon_ioctls[] = {
+@@ -3215,7 +3249,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),
@@ -33553,7 +35128,7 @@
int radeon_max_ioctl = DRM_ARRAY_SIZE(radeon_ioctls);
diff --git a/include/drm/drm.h b/include/drm/drm.h
-index 32e5096..46389d5 100644
+index 8e77357..17a1e2c 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -174,6 +174,7 @@ enum drm_map_type {
@@ -33565,7 +35140,7 @@
/**
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index afb7858..01270cb 100644
+index e5f4ae9..c963f25 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -147,9 +147,23 @@ struct drm_device;
@@ -33592,7 +35167,7 @@
/*@}*/
-@@ -659,6 +673,8 @@ struct drm_master {
+@@ -652,6 +666,8 @@ struct drm_master {
void *driver_priv; /**< Private structure for driver to use */
};
@@ -33601,7 +35176,7 @@
/**
* DRM driver structure. This structure represent the common code for
* a family of cards. There will one drm_device for each card present
-@@ -777,6 +793,8 @@ struct drm_driver {
+@@ -770,6 +786,8 @@ struct drm_driver {
/* Driver private ops for this object */
struct vm_operations_struct *gem_vm_ops;
@@ -33610,7 +35185,7 @@
int major;
int minor;
-@@ -852,7 +870,10 @@ struct drm_device {
+@@ -845,7 +863,10 @@ struct drm_device {
/*@{ */
struct list_head maplist; /**< Linked list of regions */
int map_count; /**< Number of mappable regions */
@@ -33622,7 +35197,7 @@
/** \name Context handle management */
/*@{ */
-@@ -863,6 +884,7 @@ struct drm_device {
+@@ -856,6 +877,7 @@ struct drm_device {
struct idr ctx_idr;
struct list_head vmalist; /**< List of vmas (for debugging) */
@@ -33630,7 +35205,7 @@
/*@} */
-@@ -936,7 +958,6 @@ struct drm_device {
+@@ -927,7 +949,6 @@ struct drm_device {
int num_crtcs; /**< Number of CRTCs on this device */
void *dev_private; /**< device private data */
void *mm_private;
@@ -33638,7 +35213,7 @@
struct drm_sigdata sigdata; /**< For block_all_signals */
sigset_t sigmask;
-@@ -946,6 +967,9 @@ struct drm_device {
+@@ -937,6 +958,9 @@ struct drm_device {
struct drm_minor *control; /**< Control node for card */
struct drm_minor *primary; /**< render type primary screen head */
@@ -33648,7 +35223,7 @@
/** \name Drawable information */
/*@{ */
spinlock_t drw_lock;
-@@ -968,8 +992,28 @@ struct drm_device {
+@@ -959,8 +983,28 @@ struct drm_device {
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
/*@} */
@@ -33677,7 +35252,7 @@
static inline int drm_dev_to_irq(struct drm_device *dev)
{
-@@ -1079,6 +1123,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+@@ -1070,6 +1114,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);
@@ -33695,7 +35270,7 @@
/* Misc. IOCTL support (drm_ioctl.h) */
extern int drm_irq_by_busid(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-@@ -1249,6 +1304,7 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
+@@ -1240,6 +1295,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);
@@ -33703,7 +35278,7 @@
extern void drm_agp_chipset_flush(struct drm_device *dev);
/* Stub support (drm_stub.h) */
-@@ -1290,6 +1346,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1281,6 +1337,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);
@@ -33712,7 +35287,7 @@
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align, dma_addr_t maxaddr);
-@@ -1445,6 +1503,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1438,6 +1496,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
@@ -33753,7 +35328,7 @@
#endif /* __KERNEL__ */
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
-index 0c6f0e1..e1f0f16 100644
+index 0b0d236..cb3952c 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,
@@ -34683,7 +36258,7 @@
+#endif
+#endif
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index b3bcf72..181d9de 100644
+index 912cd52..9aeb426 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -187,7 +187,7 @@ typedef struct _drm_i915_sarea {
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1272
retrieving revision 1.1273
diff -u -r1.1272 -r1.1273
--- kernel.spec 23 Feb 2009 13:52:24 -0000 1.1272
+++ kernel.spec 23 Feb 2009 16:22:24 -0000 1.1273
@@ -1150,7 +1150,7 @@
ApplyPatch linux-2.6-net-tulip-interrupt.patch
# Nouveau DRM + drm fixes
-#ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-modesetting-radeon.patch
ApplyPatch drm-nouveau.patch
ApplyPatch drm-no-gem-on-i8xx.patch
@@ -1747,6 +1747,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Feb 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.43.rc6
+- Re-enable drm-modesetting-radeon.
+
* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.42.rc6
- Linux 2.6.29-rc6
- selinux-netlabel_setsockopt_fix.patch: drop merged upstream
More information about the fedora-extras-commits
mailing list