rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.77, 1.78 drm-next.patch, 1.14, 1.15
Chuck Ebbert
cebbert at fedoraproject.org
Fri Mar 13 05:42:51 UTC 2009
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15892
Modified Files:
drm-modesetting-radeon.patch drm-next.patch
Log Message:
copy drm patches from rawhide
drm-modesetting-radeon.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.77 -r 1.78 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- drm-modesetting-radeon.patch 10 Mar 2009 06:21:23 -0000 1.77
+++ drm-modesetting-radeon.patch 13 Mar 2009 05:42:46 -0000 1.78
@@ -1,10 +1,66 @@
-commit 85510fb358cb3c0e3d526a93389a8d847b7398c0
+commit 784e2287e60f91c16814fbb757ea316b3027ddd1
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Mar 12 11:39:05 2009 +1000
+
+ drm/radeon: Don't try to use agp symbols if we don't have AGP
+
+ The radeon_buffer.c addition that gets pulled into the DRM driver as
+ part of Kernel Mode Setting (even if you disable KMS for the Radeon
+ driver) was assuming that it was safe to use symbols from the AGP code,
+ but that isn't safe on platforms where __OS_HAS_AGP is 0. Such as
+ sparc64. :)
+
+ This patch gets the code building again. It probably should go into the
+ actual kms patch, but if you would prefer this go as a separate patch, I
+ can apply it. With this, we can get rawhide building for sparc64, so I'm
+ eager to see it applied in one way or another.
+
+ Signed-off-by: Tom "spot" Callaway <tcallawa at redhat.com>
+
+commit 42a73c53bce752bca305c4ec40bff9873042ba6d
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date: Thu Mar 12 10:58:05 2009 +1000
+
+ radeon: fixup the IB getting routine
+
+ This makes the IB get routine a lot smarter and hopefully
+ fixes some cases where it exits
+
+commit 64e61a039f5e28b5d288fd2b50d44d3d42327976
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date: Thu Mar 12 10:57:17 2009 +1000
+
+ radeon: loop inside irq handler.
+
+ This makes us not leave the irq handler until we are finished.
+
+ it appears there is a race with getting interrupts and clearing them somewhere
+
+ only happens on r300 hw for me
+
+commit a446cfcfdb7d6c4b23796d6bd1fccba058543ad0
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Mar 11 18:50:06 2009 +1000
+
+ radeon: add suspend test hook
+
+ this debugfs entry just does a driver suspend then resume cycle
+
+commit 925bbb6856b01660b850c43de6629de14bd9435c
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Mar 11 11:40:13 2009 +1000
+
+ drm: add page alloc debugging for the page allocator
+
+ this just prints the page counts in debugfs
+
+commit a242a63b023ebf698c62880cfabbc210359555c0
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 10 19:01:37 2009 +1000
radeon: enable kms on r100/r200
-commit cd45bd5f01fb0294befd98ced95e46e3a6983d2c
+commit 822b8822b3573e2a4ed442e1a26a7433e9c6f503
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Mar 7 19:11:20 2009 +1100
@@ -14,7 +70,7 @@
using cached pages on PCIE ftw
-commit b34c746ed223c60c3c8aa2b9f707eaaf9e0427dc
+commit d34ffa0883066740a6871ec3e2f397ddade48dfe
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Mar 7 17:55:11 2009 +1100
@@ -26,25 +82,25 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 121cc720f350cc7a34af1d8a3c002266ba990d9b
+commit 91f056b908e2472964509e3aba8ccec2140592e7
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 16:42:06 2009 +1100
radeon: add depth offset reloc properly
-commit e2eeb3497972e391e519c2139a5ac9fd32dadccc
+commit 3a40047a3d1a5658a283ed802a2ccb38fbe000b0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 16:25:38 2009 +1100
radeon: r100/r200 add depth offset check
-commit 9abfacf388ee1f62cd2f19b32639372b781cd9b7
+commit adb5d6fe30c2b003a9ea7d6abf365de6ef88a63f
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Mar 6 06:07:38 2009 +1000
radeon: add some more texture relocations for r100/r200/r300
-commit e039bd0f71b17bad18724b5fbb0c1f72be737de2
+commit 99940847a43e85eef8ec075d2d178347b98780d1
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Mar 5 15:57:18 2009 +1000
@@ -52,19 +108,19 @@
This is half ways between a hack and really neat.
-commit bd274a6fb4d9bd78e2467620e6c5898c209dfb12
+commit 9ead2858b35181f37e660aaff30af9ee1ff14bfe
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 3 18:23:22 2009 +1000
radeon: port proc debug files to new debugfs interface
-commit f5b2321e7d646e6e7438911e811a973e34270abb
+commit 83a2415a2720f7fc07cd1f6334a755f834ab3d75
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Mar 3 15:33:52 2009 +1000
radeon: pin framebuffer and cursors dynamically
-commit dfe5afc942903cdf9240db9da3670bae07742f85
+commit 16d58ae58d87c3feeb414a7ef7afb40f33053027
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:25:36 2009 -0500
@@ -72,7 +128,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 1c653f0dd7ca80b57be396b5af67f18a73ce6bbc
+commit 7692f2d71d92b1bfb0b97ede2ff0b690fd4894f8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:18:20 2009 -0500
@@ -80,7 +136,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 709a927cf8b67b87086e7cf97cc8916f9b9106f9
+commit 1b3271400bc2ca8418104fa5fbb71573af5cb324
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:15:04 2009 -0500
@@ -88,7 +144,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 1be02ac8d9307f2aeb1190dd1e08f8588020b273
+commit fb790159474e58c3dd788bd345c38400c5939654
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 27 20:07:13 2009 -0500
@@ -96,55 +152,55 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
-commit 4e200d8a0063650385096ab6485dea9d428acecb
+commit 24591069e1bd6e1106aac024323cfbc9631fd4c4
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 2 23:51:30 2009 +1100
radeon: fixup suspend/resume hooks
-commit b6cd6f6b0c543380381fd730031831e62da3fbda
+commit 7782b006a8db3d0f07a20dd5d4797e43ab9e13fb
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Mar 1 18:25:07 2009 +1100
radeon: fix rs480 gart size
-commit 59109f23bf6e835e80d43d138f22520882618a7c
+commit 7c585cb128aa768a826c24739a4b3e4369df117b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 15:37:14 2009 +1000
radeon: disable kms by default for r600
-commit 0b64e6b2ba58ca37f8c40d3954b523e44d691430
+commit 3115c7aa9402afa66a1cf4e4461ff3d7e35e82e2
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 27 11:51:22 2009 +1000
radeon: fixup proc hacks
-commit c83e971d04031798907c5d1b3a6dfeda9eb7bbd3
+commit 4f6c693f8e6fa1aa9fcce2b26ac59396c0285af6
[...1991 lines suppressed...]
++ break;
++ }
+ }
+ }
++ pass++;
++ if (pass < 2)
++ goto restart_find;
+ }
+
-+ if (index == -1 && no_wait == 1) {
-+ no_wait = 0;
-+ goto retry_wait;
-+ }
-+
-+ if (index == -1 && no_wait == 0) {
++ if (index == -1) {
+ DRM_ERROR("Major case fail to allocate IB from freelist %llx\n", dev_priv->ib_alloc_bitmap);
+ return -EINVAL;
+ }
-+
+
+ if (parser->chunks[parser->ib_index].length_dw > RADEON_IB_SIZE / sizeof(uint32_t))
+ return -EINVAL;
@@ -26369,10 +26527,10 @@
+
diff --git a/drivers/gpu/drm/radeon/radeon_gem_debugfs.c b/drivers/gpu/drm/radeon/radeon_gem_debugfs.c
new file mode 100644
-index 0000000..d685d5b
+index 0000000..93f36ce
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_gem_debugfs.c
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,179 @@
+/*
+ * Copyright © 2008 Intel Corporation
+ *
@@ -26516,10 +26674,24 @@
+ return 0;
+}
+
++static int radeon_suspend_test(struct seq_file *m, void *data)
++{
++ struct drm_info_node *node = (struct drm_info_node *) m->private;
++ struct drm_device *dev = node->minor->dev;
++ pm_message_t msg;
++
++ msg.event = PM_EVENT_USER_SUSPEND;
++ radeon_suspend(dev, msg);
++ radeon_resume(dev);
++
++ return 0;
++}
++
+static struct drm_info_list radeon_gem_debugfs_list[] = {
+ {"radeon_gem_interrupt", radeon_interrupt_info, 0, NULL},
+ {"radeon_gem_ring", radeon_ring_info, 0, NULL},
+ {"radeon_gem_ib", radeon_ib_info, 0, NULL},
++ {"radeon_suspend_test", radeon_suspend_test, 0, NULL},
+};
+
+
@@ -26740,26 +26912,65 @@
+}
+
diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
-index 9836c70..26ee45e 100644
+index 9836c70..b6f5786 100644
--- a/drivers/gpu/drm/radeon/radeon_irq.c
+++ b/drivers/gpu/drm/radeon/radeon_irq.c
-@@ -195,11 +195,14 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -154,11 +154,10 @@ static inline u32 radeon_acknowledge_irqs(drm_radeon_private_t *dev_priv, u32 *r
+ } else
+ irq_mask |= RADEON_CRTC_VBLANK_STAT | RADEON_CRTC2_VBLANK_STAT;
+
+- irqs &= irq_mask;
+-
+ if (irqs)
+ RADEON_WRITE(RADEON_GEN_INT_STATUS, irqs);
+
++ irqs &= irq_mask;
+ return irqs;
+ }
+
+@@ -195,41 +194,49 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
if (!stat)
return IRQ_NONE;
-+ atomic_inc(&dev_priv->irq_received);
- stat &= dev_priv->irq_enable_reg;
+- stat &= dev_priv->irq_enable_reg;
++ while (stat) {
++ atomic_inc(&dev_priv->irq_received);
++ stat &= dev_priv->irq_enable_reg;
- /* SW interrupt */
+- /* SW interrupt */
- if (stat & RADEON_SW_INT_TEST)
-+ if (stat & RADEON_SW_INT_TEST) {
- DRM_WAKEUP(&dev_priv->swi_queue);
-+ radeon_fence_handler(dev);
-+ }
+- DRM_WAKEUP(&dev_priv->swi_queue);
++ /* SW interrupt */
++ if (stat & RADEON_SW_INT_TEST) {
++ DRM_WAKEUP(&dev_priv->swi_queue);
++ radeon_fence_handler(dev);
++ }
- /* VBLANK interrupt */
- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) {
-@@ -216,20 +219,23 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
+- /* VBLANK interrupt */
+- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) {
+- if (r500_disp_int & R500_D1_VBLANK_INTERRUPT)
+- drm_handle_vblank(dev, 0);
+- if (r500_disp_int & R500_D2_VBLANK_INTERRUPT)
+- drm_handle_vblank(dev, 1);
+- } else {
+- if (stat & RADEON_CRTC_VBLANK_STAT)
+- drm_handle_vblank(dev, 0);
+- if (stat & RADEON_CRTC2_VBLANK_STAT)
+- drm_handle_vblank(dev, 1);
++ /* VBLANK interrupt */
++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600) {
++ if (r500_disp_int & R500_D1_VBLANK_INTERRUPT)
++ drm_handle_vblank(dev, 0);
++ if (r500_disp_int & R500_D2_VBLANK_INTERRUPT)
++ drm_handle_vblank(dev, 1);
++ } else {
++ if (stat & RADEON_CRTC_VBLANK_STAT)
++ drm_handle_vblank(dev, 0);
++ if (stat & RADEON_CRTC2_VBLANK_STAT)
++ drm_handle_vblank(dev, 1);
++ }
++ stat = radeon_acknowledge_irqs(dev_priv, &r500_disp_int);
+ }
return IRQ_HANDLED;
}
@@ -26768,7 +26979,6 @@
{
drm_radeon_private_t *dev_priv = dev->dev_private;
unsigned int ret;
-+ int i;
RING_LOCALS;
- atomic_inc(&dev_priv->swi_emitted);
@@ -26791,7 +27001,7 @@
return ret;
}
-@@ -240,13 +246,13 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
+@@ -240,13 +247,13 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
(drm_radeon_private_t *) dev->dev_private;
int ret = 0;
@@ -26807,7 +27017,7 @@
return ret;
}
-@@ -340,7 +346,6 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
+@@ -340,7 +347,6 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
drm_radeon_private_t *dev_priv =
(drm_radeon_private_t *) dev->dev_private;
@@ -35515,7 +35725,7 @@
/**
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
-index ccbcd13..99e348d 100644
+index ccbcd13..b61b0c6 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -147,9 +147,23 @@ struct drm_device;
@@ -35653,7 +35863,15 @@
extern void drm_agp_chipset_flush(struct drm_device *dev);
/* Stub support (drm_stub.h) */
-@@ -1368,6 +1424,8 @@ extern int drm_ati_pcigart_init(struct drm_device *dev,
+@@ -1349,6 +1405,7 @@ extern int drm_bufs_info(struct seq_file *m, void *data);
+ extern int drm_vblank_info(struct seq_file *m, void *data);
+ extern int drm_clients_info(struct seq_file *m, void* data);
+ extern int drm_gem_name_info(struct seq_file *m, void *data);
++extern int drm_page_alloc_info(struct seq_file *m, void *data);
+ extern int drm_gem_object_info(struct seq_file *m, void* data);
+
+ #if DRM_DEBUG_CODE
+@@ -1368,6 +1425,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);
@@ -35662,7 +35880,7 @@
extern drm_dma_handle_t *drm_pci_alloc(struct drm_device *dev, size_t size,
size_t align, dma_addr_t maxaddr);
-@@ -1525,6 +1583,39 @@ extern void drm_free(void *pt, size_t size, int area);
+@@ -1525,6 +1584,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
drm-next.patch:
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- drm-next.patch 10 Mar 2009 06:21:25 -0000 1.14
+++ drm-next.patch 13 Mar 2009 05:42:49 -0000 1.15
@@ -1,4 +1,32 @@
-commit 24011adb61c1510fdd9c7ec9a27fc1ac4b23f1bf
+commit 06f0a488c1b642d3cd7769da66600e5148c3fad8
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Mar 13 09:35:32 2009 +1000
+
+ drm/radeon: r600 ptes are 64-bit, cleanup cleanup function.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 03efb8853c35aff51c7b901bf412f32765fe0fd9
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Mar 10 18:36:38 2009 +1000
+
+ drm/radeon: don't call irq changes on r600 suspend/resume
+
+ Until we sort out r600 IRQs don't do this.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit d02f7fa77d97a28a4276939f35e44ae995ad13d7
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Mar 10 18:34:23 2009 +1000
+
+ drm/radeon: fix r600 writeback across suspend/resume
+
+ This update was done in mainline radeon, but not in the r600.
+
+ Signed-off-by: Dave Airlie <airlied at redhat.com>
+
+commit 6546bf6d6cbf1f9ac350fd278a1d937d4bb9ad06
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 15:31:20 2009 +1000
@@ -13,7 +41,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d2d31c9fe72bf4904798fd0d01522644e49dd518
+commit 1847a549ac4db1272dea13d86331c492a2640b3b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:47:18 2009 +1000
@@ -24,7 +52,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 4ac16538732ad683c1e7c13cc569335a2db8b6c5
+commit 8f497aade8df2a619eacda927a43ebe82167a84c
Author: Hannes Eder <hannes at hanneseder.net>
Date: Thu Mar 5 20:14:18 2009 +0100
@@ -38,7 +66,7 @@
Signed-off-by: Hannes Eder <hannes at hanneseder.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ae0add29f05b2f5d22863eaefad106f2bb3919be
+commit a763d7dc0adb1159c1a52d43e566409da9fa59f0
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:17:08 2009 +1000
@@ -51,7 +79,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 9cc01249240abd94eeba0792ad6fc509e7bf072e
+commit 08932156cc2d4f8807dc5ca5c3d6ccd85080610a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Sat Mar 7 18:21:21 2009 -0500
@@ -60,7 +88,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 8ebf7ff817d032d1f6a06da8b65149b3de049e14
+commit 53c379e9462b59d4e166429ff064aaf0e7743795
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Mar 9 12:12:28 2009 +1000
@@ -70,7 +98,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 144a1136478cca4f3efe67787eec33ca07aec929
+commit 800b69951174f7de294da575d7e7921041a7e783
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Mar 6 11:47:54 2009 -0500
@@ -82,7 +110,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 664debb50231badbe84778f8945619e36555cd1d
+commit a7d13ad0e2c1b0572492fd53ca1a090794e2f8e2
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:15:24 2009 +1000
@@ -90,7 +118,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 34aa4615a2cce35e46ef23b298c90afe4903f85d
+commit eb1d91954ededc00ddcfb51e2626f114ff351524
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:14:40 2009 +1000
@@ -100,7 +128,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 840cd338857ead31f2c208f70cff2126b6838fd0
+commit 6abf66018f7fe231720e50f9a47b142182388869
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:13:47 2009 +1000
@@ -110,7 +138,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ae18cf3a76471e058613a5a1256969b8cfd27128
+commit 87f0da55353e23826a54bff57c457a13b97d18f1
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Feb 26 10:12:10 2009 +1000
@@ -122,7 +150,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit c79813faebe755991896c699773f50851c670d4c
+commit 8ced9c75160947d2235fba75de9413e087e1171a
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 17:02:19 2009 -0500
@@ -131,7 +159,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit a7f4943d120ba4c45cff2bd22883f598024a08dc
+commit c1556f71513f2e660fb2bbdc29344361b1ebff35
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 16:57:49 2009 -0500
@@ -144,7 +172,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b7fd19e6342c5f2522ec35dec0a92c8069813255
+commit 7659e9804b7a66047433182d86393d38ba4eff79
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Wed Feb 25 15:55:01 2009 -0500
@@ -155,7 +183,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 393f865abfb61363ba117cb0c3ea5032bc0a3a3c
+commit 7335aafa30ecf39ede7f24bd2036dfbf4c25f269
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 17:13:42 2009 -0500
@@ -164,7 +192,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 6b3287c090c2c3eee993a96886f2f597c9e6ccfa
+commit c05ce0834a268f7d18274847190f6ed826b99332
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 16:22:29 2009 -0500
@@ -176,7 +204,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit e5a4f4a67d0e886b68ebb122b9282289bf9d6d7f
+commit 80b3334a4d5c163ab35c560a21d2cdc39bb5d3f8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 14:28:34 2009 -0500
@@ -191,7 +219,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 0c9f2a4eb40612b22c4bb32b9fe9bcbb82c99e10
+commit befb73c2322923766df7e36b51f407dbdc047eab
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Feb 24 14:02:13 2009 -0500
@@ -204,7 +232,7 @@
Signed-off-by: Alex Deucher <alexdeucher at gmail.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 3d802792f818036520ab805ded2904a749af4a48
+commit 995e37cafb90f104395e015a9836cc459df1fc39
Author: Owain G. Ainsworth <oga at openbsd.org>
Date: Fri Feb 20 08:30:19 2009 +0000
@@ -222,7 +250,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 088b364ce837e5b1fc8dd022bb5f98c8f3d96e3c
+commit 87ba7c663af0f34aa603a5bb448783a5ed64573f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Wed Feb 11 14:26:38 2009 +0000
@@ -232,7 +260,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b884af03178e5cd139c8f566090ce763fb9e3a2b
+commit 97d479e77b8621cc6e1cb06eabe5a73390c8149c
Author: Eric Anholt <eric at anholt.net>
Date: Tue Feb 17 23:53:41 2009 -0800
@@ -245,7 +273,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ceeb73a867fe64a1de124cd3e9d776e89944f940
+commit 30106f97a6029f94a8f13a1ace877c850cf5cd37
Author: Ben Gamari <bgamari at gmail.com>
Date: Tue Feb 17 20:08:51 2009 -0500
@@ -258,7 +286,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit b1645221d43bbfab70c5c5cfdc9e9733e380fca0
+commit 955b12def42e83287c1bdb1411d99451753c1391
Author: Ben Gamari <bgamari at gmail.com>
Date: Tue Feb 17 20:08:49 2009 -0500
@@ -278,7 +306,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d4b25b68f700e27a09c0c5a372c6ee5c1ec45b8e
+commit dd8d7cb49e6e61da96ca44174b063081892c4dc6
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 20 13:28:59 2009 +1000
@@ -288,7 +316,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 0c37ea7ccc5dabc1cd53780ae4600c6d0644b9f3
+commit 4247ca942a16745da3d09c58996b276d02655a72
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Feb 20 13:28:34 2009 +1000
@@ -301,7 +329,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit f7d0d89cc8da1e1ca489d5df3df68b00c0dd59d4
+commit cd00f95aff6b4cfeccb261fd4100cceb4f5270ea
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Fri Feb 6 16:46:27 2009 +1100
@@ -313,7 +341,7 @@
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit e22139bc821f295d25c0eddbeb65facf1f395458
+commit 09e40d65d0aa6680428143cda1a7bdc8846ee991
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 01:35:21 2009 -0800
@@ -328,7 +356,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 85cee125f1756aeaa35e02db01987a0a4a5db909
+commit 958a6f8ccb1964adc3eec84cf401c5baeb4fbca0
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 01:35:23 2009 -0800
@@ -344,7 +372,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 37d1de5730f78a682a19a47f83893e6116a65325
+commit f1a2a9b6189f9f5c27672d4d32fec9492c6486b2
Author: David Miller <davem at davemloft.net>
Date: Wed Feb 18 15:41:02 2009 -0800
@@ -382,7 +410,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit ddaf8998790ba8d389859fa6420c7da38db91191
+commit d30333bbabb4a2cfad1f1a45c48a4e4d0065c1f6
Author: David Miller <davem at davemloft.net>
Date: Sun Feb 15 01:08:07 2009 -0800
@@ -400,7 +428,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 1a531c0b82db724bf802f5e100c2c2fc08d54459
+commit 6abf6bb0ff90bb77f9429bd0d90fc841c358daf3
Author: David Miller <davem at davemloft.net>
Date: Sat Feb 14 01:51:07 2009 -0800
@@ -422,7 +450,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 7c5627f23a200c4ab9563b0f1fcfc6984be6ce0b
+commit e8a894372b4ea05dc266ba7d7a7634315b6230e8
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:44 2009 -0800
@@ -434,7 +462,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 0a5bd3c5c690560a24886d25c5031291c0efbc35
+commit b266503072f824a82d585a6d41ebd591a2d7daa4
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:39 2009 -0800
@@ -446,7 +474,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 557d71764de798c60cc504f678aaf66a01374860
+commit b07fa022ecf1e04fd0623877affe9e10bf45ac86
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:37 2009 -0800
@@ -469,7 +497,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2a2aba5d992576a6d73666be1e5ef0248b7a5c1b
+commit 296c6ae0e9b5ced1060b43a68b5f7e41a18509f6
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:34 2009 -0800
@@ -486,7 +514,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit f087a3713864f4d3bba746cb70aaebbf9ee1e13f
+commit 5a7aad9a559a5488cbef7aa3d4d96fc28220b8ae
Author: David Miller <davem at davemloft.net>
Date: Thu Feb 12 02:15:27 2009 -0800
@@ -507,7 +535,7 @@
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 928278d2dfc9e3d1af52dd037c13693add544501
+commit 8e1004580e0c862cb6bbe2ff8e496f846c54052f
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Jan 5 16:10:05 2009 -0500
@@ -526,7 +554,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2c3a4c2e0f4127adbf9cecb473f2ac4576d289aa
+commit 112b715e8e2f9ef7b96930888bb099ce10b4c3cc
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Sun Jan 4 16:55:33 2009 -0500
@@ -540,7 +568,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 731b22a5b708f10e45847007a8d786568cb8becc
+commit 41c2e75e60200a860a74b7c84a6375c105e7437f
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:47 2009 +1100
@@ -567,7 +595,7 @@
Signed-off-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 3365ed3f4b72d9eaecc7a67ff0f3078c9053806d
+commit f77d390c9779c496aa5b99ec832996fb76bb1d13
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:46 2009 +1100
@@ -598,7 +626,7 @@
Acked-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit 2d072cd331fb6434406977ac3bbe7a58589f5cca
+commit d883f7f1b75c8dcafa891f7b9e69c5a2f0ff6d66
Author: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Date: Mon Feb 2 16:55:45 2009 +1100
@@ -3011,7 +3039,7 @@
intel_display.o \
intel_crt.o \
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 6dab63b..7fecc6d 100644
+index 6d21b9e..4d9f5c6 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1057,7 +1057,7 @@ void i915_master_destroy(struct drm_device *dev, struct drm_master *master)
@@ -3100,10 +3128,10 @@
.name = DRIVER_NAME,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 17fa408..3951a12 100644
+index d6cc986..1bc45a7 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
-@@ -599,8 +599,6 @@ int i915_gem_get_tiling(struct drm_device *dev, void *data,
+@@ -604,8 +604,6 @@ int i915_gem_get_tiling(struct drm_device *dev, void *data,
int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
void i915_gem_load(struct drm_device *dev);
@@ -3112,7 +3140,7 @@
int i915_gem_init_object(struct drm_gem_object *obj);
void i915_gem_free_object(struct drm_gem_object *obj);
int i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment);
-@@ -644,6 +642,10 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
+@@ -649,6 +647,10 @@ void i915_gem_dump_object(struct drm_gem_object *obj, int len,
const char *where, uint32_t mark);
void i915_dump_lru(struct drm_device *dev, const char *where);
@@ -3124,7 +3152,7 @@
extern int i915_save_state(struct drm_device *dev);
extern int i915_restore_state(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
-index 85685bf..cb6493a 100644
+index 37427e4..8d5ec5f 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -627,7 +627,7 @@ i915_gem_create_mmap_offset(struct drm_gem_object *obj)
@@ -3136,7 +3164,7 @@
int ret = 0;
/* Set the object up for mmap'ing */
-@@ -1868,7 +1868,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
+@@ -1913,7 +1913,6 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write)
static int
i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
{
@@ -3144,7 +3172,7 @@
int ret;
i915_gem_object_flush_gpu_write_domain(obj);
-@@ -1887,7 +1886,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
+@@ -1932,7 +1931,6 @@ i915_gem_object_set_to_cpu_domain(struct drm_gem_object *obj, int write)
/* Flush the CPU cache if it's still invalid. */
if ((obj->read_domains & I915_GEM_DOMAIN_CPU) == 0) {
i915_gem_clflush_object(obj);
@@ -3152,7 +3180,7 @@
obj->read_domains |= I915_GEM_DOMAIN_CPU;
}
-@@ -2099,7 +2097,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
+@@ -2144,7 +2142,6 @@ i915_gem_object_set_to_gpu_domain(struct drm_gem_object *obj)
static void
i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
{
@@ -3160,7 +3188,7 @@
struct drm_i915_gem_object *obj_priv = obj->driver_private;
if (!obj_priv->page_cpu_valid)
-@@ -2115,7 +2112,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
+@@ -2160,7 +2157,6 @@ i915_gem_object_set_to_full_cpu_read_domain(struct drm_gem_object *obj)
continue;
drm_clflush_pages(obj_priv->page_list + i, 1);
}
@@ -3921,10 +3949,10 @@
cmdbuf->bufsz -= sizeof(u64);
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c
new file mode 100644
-index 0000000..04fde35
+index 0000000..76eb0d5
--- /dev/null
+++ b/drivers/gpu/drm/radeon/r600_cp.c
-@@ -0,0 +1,2256 @@
+@@ -0,0 +1,2253 @@
+/*
+ * Copyright 2008-2009 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
@@ -4052,7 +4080,7 @@
+ return;
+
+ if (gart_info->bus_addr) {
-+ max_pages = (gart_info->table_size / sizeof(u32));
++ max_pages = (gart_info->table_size / sizeof(u64));
+ pages = (entry->pages <= max_pages)
+ ? entry->pages : max_pages;
+
@@ -5664,9 +5692,6 @@
+
+ RADEON_WRITE(R600_CP_DEBUG, (1 << 27) | (1 << 28));
+
-+ /* Start with assuming that writeback doesn't work */
-+ dev_priv->writeback_works = 0;
-+
+ /* Initialize the scratch register pointer. This will cause
+ * the scratch register values to be written out to memory
+ * whenever they are updated.
@@ -30298,10 +30323,10 @@
+ }
+}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index fef2078..2cb4f32 100644
+index fef2078..13a60f4 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -41,23 +41,12 @@ int radeon_no_wb;
+@@ -41,23 +41,15 @@ int radeon_no_wb;
MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers");
module_param_named(no_wb, radeon_no_wb, int, 0444);
@@ -30320,22 +30345,29 @@
{
drm_radeon_private_t *dev_priv = dev->dev_private;
++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
++ return 0;
++
/* Disable *all* interrupts */
- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
RADEON_WRITE(R500_DxMODE_INT_MASK, 0);
RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
return 0;
-@@ -68,7 +57,7 @@ static int radeon_resume(struct drm_device *dev)
+@@ -67,8 +59,11 @@ static int radeon_resume(struct drm_device *dev)
+ {
drm_radeon_private_t *dev_priv = dev->dev_private;
++ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
++ return 0;
++
/* Restore interrupt registers */
- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690)
+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS600)
RADEON_WRITE(R500_DxMODE_INT_MASK, dev_priv->r500_disp_irq_reg);
RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
return 0;
-@@ -95,7 +84,6 @@ static struct drm_driver driver = {
+@@ -95,7 +90,6 @@ static struct drm_driver driver = {
.get_vblank_counter = radeon_get_vblank_counter,
.enable_vblank = radeon_enable_vblank,
.disable_vblank = radeon_disable_vblank,
More information about the fedora-extras-commits
mailing list