rpms/kernel/devel drm-modesetting-radeon.patch, 1.49, 1.50 kernel.spec, 1.1149, 1.1150 drm-intel-gem-x86-64-faster.patch, 1.1, NONE drm-next.patch, 1.2, NONE linux-2.6-agp-intel-cantiga-fix.patch, 1.1, NONE nvidia-agp.patch, 1.1, NONE
Dave Airlie
airlied at fedoraproject.org
Mon Dec 8 03:24:59 UTC 2008
- Previous message (by thread): rpms/constantine/F-10 constantine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/constantine/F-9 constantine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19951
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Removed Files:
drm-intel-gem-x86-64-faster.patch drm-next.patch
linux-2.6-agp-intel-cantiga-fix.patch nvidia-agp.patch
Log Message:
* Mon Dec 08 2008 Dave Airlie <airlied at redhat.com>
- modesetting: rebase radeon patch
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.49 -r 1.50 drm-modesetting-radeon.patch
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- drm-modesetting-radeon.patch 3 Nov 2008 01:28:04 -0000 1.49
+++ drm-modesetting-radeon.patch 8 Dec 2008 03:24:57 -0000 1.50
@@ -1,1271 +1,15 @@
-commit 96b17b8573d9d8d9507602c9dfb0a1b87e6ff1f5
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Nov 3 09:56:02 2008 +1100
-
- radeon: if modesetting state is unknown make it known so pm-utils can use it
-
-commit 73487c9e856db6613b465827372ac618dca4447e
-Author: Dave Airlie <airlied at redhat.com>
-Date: Fri Oct 31 14:40:12 2008 +1000
-
- radeon: fix ROP values for the paint ROP
-
-commit 6c478ab791fd0242bf7abf871570d1af0c2285a9
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Oct 30 14:00:39 2008 +1000
-
- radeon: add mtrr support for VRAM aperture.
-
- This speeds things up a bit
-
-commit 465bcd6438c356a8ff2b07d16176826f6a1762c4
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Oct 30 14:00:15 2008 +1000
-
- radeon: disable AGP for certain chips if not specified until we figure it out
-
-commit 3c57b60805cc6d8bbec85ce147fa8bbd0404cb08
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Oct 29 15:45:47 2008 +1000
-
- radeon: disable debugging message
-
-commit ff8636f1cad7c113e028f193a375cab3fa89b754
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Oct 29 15:37:32 2008 +1000
-
- radeon: commit ring after emitting the buffer discards
-
-commit 8b47ffa57ec22f6ccbfe26e42ae669a780b47519
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Oct 29 17:39:27 2008 +1100
-
- radeon: fix whitespace in encoders C file
-
-commit d0c8c7eec6c3be242773189f5efeeb79ed3551c0
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Oct 29 17:39:08 2008 +1100
-
- radeon: add more HDMI bits
-
-commit f033476f111cadd20f347b124256e17f0d1aa7c8
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Oct 30 01:41:34 2008 +1000
-
- radeon: set dma bufs bo type to a kernel type
-
-commit 962e3a492751ca48ebc46de6ee952cd91d344ff6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Oct 30 01:05:48 2008 +1000
-
- drm: reorder AGP unloading wrt driver unloading
-
-commit b94da1ca049a8d110c7694f74bcfcb5564ea8a65
-Author: Dave Airlie <airlied at redhat.com>
-Date: Wed Oct 29 15:46:16 2008 +1100
-
- radeon: enable DVI-D + HDMI connectors.
-
- This allows the rs690 to work on DVI
-
-commit df78b729e04e0bde33d88526f594ac70f8fe1649
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 20:33:13 2008 +1000
-
- radeon: setup isync cntl properly
-
-commit 9aea2a12e6a98a889dfa3031a5f7199e35bdb42d
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 20:31:27 2008 +1000
-
- radeon: add more debugging
-
-commit 2be1531419a8fb4abe33ce0e2202aed52ba59700
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 20:26:04 2008 +1000
-
- radeon: overhaul ring interactions
-
- emit in 16-dword blocks, emit irqs at same time as everything else
-
-commit b7f75f50040569ad8187cc5b3c97a7ef806ec513
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 16:49:09 2008 +1000
-
- radeon: fix race in sysfs
-
-commit 1a26da2f878bc6bf52676e35676bc5034cd9a9fe
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 16:46:47 2008 +1000
-
- radeon: add proc debugging for interrupts/ring
-
-commit a50011a833c6bc3c1437376cb5d106d45250aeb5
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 16:44:54 2008 +1000
-
- radeon: only enable dynclks if asked for
-
-commit 927236acfb2a745d42c2f70c9099bdf664b2e26b
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 06:35:10 2008 +1000
-
- radeon: add wait rendering API
-
-commit c5ac6f0d9dedfaa78987d00ed2dfa7296ba55668
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 28 06:05:58 2008 +1000
-
- radeon: rs480 fixes for bus mastering
-
-commit dcdddb966eee207a3a24b8e0c2fcd7caf30f512d
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 18:30:15 2008 +1000
-
- radeon: remove unused gem indirect ioctl
-
-commit 3d3d149bb684e40fd0f64e6bd24435cca67f3782
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 16:41:09 2008 +1000
-
- radeon: fix some warnings
-
-commit bd62d1ad62cafae3b4e6fe577b422e4995da3813
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 16:40:34 2008 +1000
-
- radeon: fix free after refcount
-
-commit f51358b70d8305688a10dc144d13c18736695971
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 16:40:15 2008 +1000
-
- radeon: CS2 make it all work with new relocs style
-
-commit 410f9425d0a3d44ddd01f63ef0853685c92171f6
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 16:39:12 2008 +1000
-
- radeon: don't copy to user the cs ids
-
-commit 2df731f61efe9456691fcabc11017149806d1151
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 14:23:22 2008 +1000
-
- radeon: make new CS2 command submission interface port older interface to this
-
-commit a0d1c8a1614ce63133fa97527ea7fda11305d609
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 27 10:26:03 2008 +1000
-
- radeon/drm: fixup ref counting in on fb objs
-
-commit 35f2b23e19b93e6537c07a670ec3a607d22051ec
-Author: Dave Airlie <airlied at redhat.com>
-Date: Thu Oct 23 19:13:50 2008 +1000
-
- radeon: release agp on module unload
-
-commit 0e05709a0476a4572d5bc5ff44a56fc880781a19
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 21 14:15:23 2008 +1000
-
- radeon: add r423 bits to modesetting
-
-commit b1ce1ffa6e1cef9d5c41d4ec26cc79340305565a
-Author: Dave Airlie <airlied at redhat.com>
-Date: Tue Oct 21 14:12:38 2008 +1000
-
- radeon: pull bus master enable into its own function
-
-commit 0eff75d4d9349e6e46b8ef63fd16d6dd9269a013
-Author: Dave Airlie <airlied at redhat.com>
-Date: Mon Oct 20 14:44:23 2008 +1000
-
- radeon: fix accessible VRAM sizing.
-
- We actually were passing accessible to userspace, but I thought
- the code sized it correctly, however it doesn't seem to.
-
-commit 04107087a90fe834f6c769d8420b9ed4809ffa6b
-Author: Dave Airlie <airlied at redhat.com>
[...6588 lines suppressed...]
+@@ -759,13 +826,11 @@ struct drm_minor {
* may contain multiple heads.
*/
struct drm_device {
- char *unique; /**< Unique identifier: e.g., busid */
- int unique_len; /**< Length of unique field */
++ /* linked list of devices per driver */
++ struct list_head driver_item;
char *devname; /**< For /proc/interrupts */
int if_version; /**< Highest interface version set */
@@ -41213,7 +41325,7 @@
/** \name Locks */
/*@{ */
spinlock_t count_lock; /**< For inuse, drm_device::open_count, drm_device::buf_use */
-@@ -788,18 +849,15 @@ struct drm_device {
+@@ -788,18 +853,15 @@ struct drm_device {
atomic_t counts[15];
/*@} */
@@ -41236,7 +41348,7 @@
/** \name Context handle management */
/*@{ */
-@@ -810,7 +868,10 @@ struct drm_device {
+@@ -810,7 +872,10 @@ struct drm_device {
struct idr ctx_idr;
struct list_head vmalist; /**< List of vmas (for debugging) */
@@ -41248,7 +41360,7 @@
/*@} */
/** \name DMA queues (contexts) */
-@@ -889,14 +950,21 @@ struct drm_device {
+@@ -887,14 +952,21 @@ struct drm_device {
struct drm_driver *driver;
drm_local_map_t *agp_buffer_map;
unsigned int agp_buffer_token;
@@ -41270,7 +41382,7 @@
/** \name GEM information */
/*@{ */
spinlock_t object_name_lock;
-@@ -911,8 +979,28 @@ struct drm_device {
+@@ -909,8 +981,28 @@ struct drm_device {
uint32_t invalidate_domains; /* domains pending invalidation */
uint32_t flush_domains; /* domains pending flush */
/*@} */
@@ -41299,7 +41411,7 @@
static inline int drm_dev_to_irq(struct drm_device *dev)
{
-@@ -1020,6 +1108,17 @@ extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+@@ -1018,6 +1110,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);
@@ -41317,7 +41429,7 @@
/* Misc. IOCTL support (drm_ioctl.h) */
extern int drm_irq_by_busid(struct drm_device *dev, void *data,
struct drm_file *file_priv);
-@@ -1190,9 +1289,17 @@ extern DRM_AGP_MEM *drm_agp_allocate_memory(struct agp_bridge_data *bridge, size
+@@ -1186,9 +1289,17 @@ 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);
@@ -41335,7 +41447,7 @@
extern int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
struct drm_driver *driver);
extern int drm_put_dev(struct drm_device *dev);
-@@ -1224,6 +1331,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1220,6 +1331,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);
@@ -41344,7 +41456,7 @@
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align, dma_addr_t maxaddr);
-@@ -1235,7 +1344,11 @@ struct drm_sysfs_class;
+@@ -1231,7 +1344,11 @@ struct drm_sysfs_class;
extern struct class *drm_sysfs_create(struct module *owner, char *name);
extern void drm_sysfs_destroy(void);
extern int drm_sysfs_device_add(struct drm_minor *minor);
@@ -41356,7 +41468,7 @@
/*
* Basic memory manager support (drm_mm.c)
-@@ -1373,6 +1486,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1369,6 +1486,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
@@ -42120,10 +42232,10 @@
+
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
new file mode 100644
-index 0000000..c071915
+index 0000000..a0dd667
--- /dev/null
+++ b/include/drm/drm_crtc_helper.h
-@@ -0,0 +1,96 @@
+@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2006 Keith Packard
+ * Copyright © 2007 Intel Corporation
@@ -42219,6 +42331,8 @@
+}
+
+extern int drm_helper_resume_force_mode(struct drm_device *dev);
++extern void drm_helper_set_connector_dpms(struct drm_connector *connector,
++ int dpms_mode);
+#endif
diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
new file mode 100644
@@ -42690,10 +42804,10 @@
+#endif
diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h
new file mode 100644
-index 0000000..cdd8236
+index 0000000..604c8f8
--- /dev/null
+++ b/include/drm/drm_objects.h
-@@ -0,0 +1,900 @@
+@@ -0,0 +1,913 @@
+/**************************************************************************
+ *
+ * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -43357,6 +43471,9 @@
+#define _DRM_FLAG_MEMTYPE_CMA 0x00000010 /* Can't map aperture */
+#define _DRM_FLAG_MEMTYPE_CSELECT 0x00000020 /* Select caching */
+
++#define _DRM_BM_ALLOCATOR_CACHED 0x0
++#define _DRM_BM_ALLOCATOR_UNCACHED 0x1
++
+struct drm_buffer_manager {
+ struct drm_bo_lock bm_lock;
+ struct mutex evict_mutex;
@@ -43371,6 +43488,7 @@
+ unsigned long cur_pages;
+ atomic_t count;
+ struct page *dummy_read_page;
++ int allocator_type;
+};
+
+struct drm_bo_driver {
@@ -43586,6 +43704,15 @@
+ void **virtual);
+extern void drm_mem_reg_iounmap(struct drm_device *dev, struct drm_bo_mem_reg * mem,
+ void *virtual);
++
++/*
++ * drm_uncached.c
++ */
++extern int drm_uncached_init(void);
++extern void drm_uncached_fini(void);
++extern struct page *drm_get_uncached_page(void);
++extern void drm_put_uncached_page(struct page *page);
++
+#ifdef CONFIG_DEBUG_MUTEXES
+#define DRM_ASSERT_LOCKED(_mutex) \
+ BUG_ON(!mutex_is_locked(_mutex) || \
@@ -43615,7 +43742,7 @@
/** Maximum number of drawables in the SAREA */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index eb4b350..7d88a21 100644
+index 152b34d..13c91fc 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
@@ -43662,7 +43789,7 @@
} drm_i915_sarea_t;
/* Flags for perf_boxes
-@@ -162,7 +174,7 @@ typedef struct _drm_i915_sarea {
+@@ -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)
@@ -43671,7 +43798,7 @@
#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)
-@@ -176,6 +188,8 @@ 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)
@@ -43680,9 +43807,9 @@
#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)
-@@ -191,10 +205,22 @@ typedef struct _drm_i915_sarea {
- #define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
+@@ -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)
+/* Asynchronous page flipping:
+ */
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1149
retrieving revision 1.1150
diff -u -r1.1149 -r1.1150
--- kernel.spec 6 Dec 2008 01:40:28 -0000 1.1149
+++ kernel.spec 8 Dec 2008 03:24:58 -0000 1.1150
@@ -656,10 +656,6 @@
Patch1550: linux-2.6-cdrom-door-status.patch
# nouveau + drm fixes
-Patch1800: nvidia-agp.patch
-Patch1801: linux-2.6-agp-intel-cantiga-fix.patch
-Patch1810: drm-next.patch
-Patch1811: drm-intel-gem-x86-64-faster.patch
Patch1812: drm-modesetting-radeon.patch
Patch1813: drm-modesetting-i915.patch
Patch1814: drm-nouveau.patch
@@ -1306,11 +1302,7 @@
#ApplyPatch linux-2.6-olpc-touchpad.patch
# Nouveau DRM + drm fixes
-#ApplyPatch nvidia-agp.patch
-#ApplyPatch linux-2.6-agp-intel-cantiga-fix.patch
-#ApplyPatch drm-next.patch
-#ApplyPatch drm-intel-gem-x86-64-faster.patch
-#ApplyPatch drm-modesetting-radeon.patch
+ApplyPatch drm-modesetting-radeon.patch
#ApplyPatch drm-modesetting-i915.patch
#ApplyPatch drm-nouveau.patch
@@ -1922,6 +1914,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Mon Dec 08 2008 Dave Airlie <airlied at redhat.com>
+- modesetting: rebase radeon patch
+
* Fri Dec 05 2008 Dave Jones <davej at redhat.com>
- 2.6.28-rc7-git5
--- drm-intel-gem-x86-64-faster.patch DELETED ---
--- drm-next.patch DELETED ---
--- linux-2.6-agp-intel-cantiga-fix.patch DELETED ---
--- nvidia-agp.patch DELETED ---
- Previous message (by thread): rpms/constantine/F-10 constantine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/constantine/F-9 constantine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list