rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.56, 1.57 kernel.spec, 1.1146, 1.1147

Dave Airlie airlied at fedoraproject.org
Fri Nov 14 06:07:07 UTC 2008 

Author: airlied

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10636

Modified Files:
	drm-modesetting-radeon.patch kernel.spec 
Log Message:
- radeon - fix low memory issues and locking oops causer


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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- drm-modesetting-radeon.patch	13 Nov 2008 06:51:05 -0000	1.56
+++ drm-modesetting-radeon.patch	14 Nov 2008 06:06:35 -0000	1.57
@@ -1,52 +1,66 @@
-commit 7a18b8c8e13e786da7f5258c9dd4c989f65912ce
+commit 9d4eb07f155cde0648888efb6a4b6e1e4596e786
+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 6ea5a728bb6081d876e982a6754bd883557b9fa3
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Fri Nov 14 15:51:44 2008 +1000
+
+    radeon: fixup relocate to work on locate write buffers in VRAM first.
+    
+    Fixup failure paths and make EAGAIN work
+
+commit a7d881ccf0f7a099ba1b2b38d880df8bddc610a2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Nov 13 17:22:26 2008 +1100
 
     radeon: fix some issues since last rebase
 
-commit 0b82eaa4c7edb0051aa75fbe83ce1c5ad8a32ecb
+commit d6568c59bd20f95e9ade0c28018ed0063fda240f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 12 09:01:14 2008 +1000
 
     radeon: fix more build
 
-commit 57f078dac6cf77eaf37f61c761b0558f15332a53
+commit 3f90df7abcb0c88dca52b7287f7675f26d8fa34b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 12 08:59:04 2008 +1000
 
     radeon: fix compile
 
-commit cfc56c533c22b5234f9a9ca4a5d8be8a25093f9d
+commit fe3e14dd8da2fd7f4566b32e1e42349089dd9966
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 12 08:58:55 2008 +1000
 
     i915: fix master bits
 
-commit 64ee3e3283e938d784b4ced21eb746e92456ac05
+commit 927c18a7e25921dd80a8c503259017ff44345437
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 10 15:39:25 2008 +1000
 
     radeon: fix dumbness in cp ring check
 
-commit e83b549396f6f63fae374b665f7193624f04cf0e
+commit 04db227571a0a71bb2b6e0781a736fcfe7d5d6c1
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 10 14:26:11 2008 +1000
 
     radeon: add gart useable size to report to userspace
 
-commit 010e8c3c0a5f11548d1c7c9bdecb09d8085c1153
+commit 535b93cc86a15d616e03ea1f835fe46ba30dc736
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sun Nov 9 20:34:49 2008 +1000
 
     radeon: fix powerpc oops on rv280
 
-commit 751b6360f554064038cd54d4ab6c58551bb0b137
+commit 2894f0654cbae1f21924978d7616263d372b974e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sun Nov 9 10:23:43 2008 +1000
 
     radeon: upgrade atom headers
 
-commit 206573818c9bd2007045bd2b00b8d69f25f19129
+commit 5e5d4afda733b61984b81c34ca99488b69d80d89
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sat Nov 8 14:39:41 2008 +1000
 
@@ -55,13 +69,13 @@
     For some reason reading the SCRATCH reg from RAM causes some race to occur.
     Hopefully fix this.
 
-commit 8df6f9b1cd12c07e64e3c9e7eeb7e0a4ebb8e918
+commit ddbc65e2d9ae672ee47493934d3c73c13a17423b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sat Nov 8 11:31:03 2008 +1000
 
     drm/radeon: add dpms connector functions
 
-commit 9865e4cd640cc400eeb82de5f03faf27271194f0
+commit 7301aabea9a13ff5fa92c97127581d78e656bb09
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Nov 7 16:22:22 2008 +1000
 
@@ -69,13 +83,13 @@
     
     fixes cursor on second head
 
-commit b4b5ac74e5ae7e903a9fef36f8fed8f2fed8e4d7
+commit 06e72c30a166a0786464b2aac26c32533231c666
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Nov 7 16:21:03 2008 +1000
 
     modesetting: set the crtc x,y after the mode base change
 
-commit f6f60747b33c49583058aec7742651ae4e2a1dd5
+commit 2bf8bd4aa80b64dfe2b0a491b8376ed24354ff5f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 5 10:23:35 2008 +1000
 
@@ -83,19 +97,19 @@
     
     This allows re-use of uc/wc marked pages
 
-commit 506a5fc4d024831984cf03d600b00542e0590232
+commit 2c3b398237b44831696f1125655e1f675df3076c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Nov 5 10:22:27 2008 +1000
 
     radeon: fix ring tail overflow issue since alignment
 
-commit d55c23ee1aafdb58b56cd7f79265b807db451630
+commit d6c0947428be7af618990d7db93b4b1b9403bca7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Nov 4 13:18:02 2008 +1000
 
     radeon: disable HDP read cache for now
 
-commit 735a1e806cce1bed41ed88f037996d8e79a05f68
+commit 63527c82f569bf726666716f674f034d826c2e0e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Nov 4 12:02:55 2008 +1000
 
@@ -103,25 +117,25 @@
     
     Also set the fetch size to what tcore/fglrx uses.
 
-commit 6fbaca28b0f758ea4b0dab4465fe3327731b8a61
+commit 4a49fb763b2fb3f1f7de8cfa30d34e9a6da22069
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Nov 3 15:43:08 2008 +1000
 
     radeon: fixup vram visible calculation to take a/c pinned objects for now
 
-commit cab768070068a23104669b297bde69afd376c948
+commit ba94d70d0bcbbce6ad16adbc5e811baa00dc31c5
 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 8f3d7f72514fdfc6d08af57d3eb524c9298f3c29
+commit 50f5435a1be89f68096d700b3d001f1dab0863be
 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 b8f49e9742218522a4055c9ea785985e785dd594
+commit 459586927351eb9d8ab93b1ab2b8215b1de3ec43
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 30 14:00:39 2008 +1000
 
@@ -129,49 +143,49 @@
     
     This speeds things up a bit
 
-commit 6661d4b5cc27f7cb68e02422757bda9ff484f858
+commit 76580a7eed651717f0a6dbf53d1fef3e704382be
 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 6e0f6af77078937bdc281fb4176aeed2edde6584
+commit 184f8908eec6ac94affcee38fb6b66e8da61b122
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 15:45:47 2008 +1000
 
     radeon: disable debugging message
 
-commit 7caa8d08da1c2e8ad4854fb105ff1693f88eb34a
+commit 5243ebcb7114ba7da8c3f9960333ff4a0a092af3
 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 6101f872089b5c8294def71ee0c36c007ada05f0
+commit 215029e167aa076ae79b7de662b10f42c101fe98
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 17:39:27 2008 +1100
 
     radeon: fix whitespace in encoders C file
 
-commit 98d4f9dc83f46c551a4c484e901089b427b4f734
+commit 23d61ca8874a750c3aedb606fa98d28af57c8043
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 17:39:08 2008 +1100
 
     radeon: add more HDMI bits
 
-commit b3d19d62fc7e0f2932bae78212421b4df2e27f97
+commit 1e45a4b8124673f072ea2c0b2c2a663370786523
 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 3a8f56c1e386ea668098fdab8ced78bbb95ad95a
+commit a346f76f8746a0cc478c4adbcf5a05c19b66c0de
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 30 01:05:48 2008 +1000
 
     drm: reorder AGP unloading wrt driver unloading
 
-commit 41dff619912ddd848dce0cfce5cdc2265b173121
+commit aac4405547edf7788d005ffce1f8f6a4efcd0588
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 29 15:46:16 2008 +1100
 
@@ -179,19 +193,19 @@
     
     This allows the rs690 to work on DVI
 
-commit 12cb72cc57b1ba221c2b7af190fa990c7e315ea7
+commit 3cdd3ba5b40548183a91852819119dbc2bc7cb21
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 20:33:13 2008 +1000
 
     radeon: setup isync cntl properly
 
-commit 970ac952ce80060e457677d2074a7411a15d645c
+commit 9483186878d00768eff04a3e8eea8c09b646c2df
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 20:31:27 2008 +1000
 
     radeon: add more debugging
 
-commit 92d5db564ef725ae0bfb7af03df6ce61a338dc49
+commit c055c200958b019835cc727e03fa50f302404099
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 20:26:04 2008 +1000
 
@@ -199,97 +213,97 @@
     
     emit in 16-dword blocks, emit irqs at same time as everything else
 
-commit 336eff5cefec84ff4dea7baf4fd4a82c136cf642
+commit 9428108fcd8f96a5a8a09bddf9c21eabd43e3f72
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 16:49:09 2008 +1000
 
     radeon: fix race in sysfs
 
-commit 18c5021737af72994981ce218d28a229faf8c9d2
+commit 5607dc511cea0c66e8c422aa6cb0ac8562d5afcb
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 16:46:47 2008 +1000
 
     radeon: add proc debugging for interrupts/ring
 
-commit 2a891800070d87fb5752ddb46575497f374166f9
+commit 3360e8825e23c0a80b1fd93fd12fc7816bcd2a4f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 16:44:54 2008 +1000
 
     radeon: only enable dynclks if asked for
 
-commit c4644c9fadb882a4287b3c57902a301245e05a69
+commit 8346c15aa0bb6e47251708752451685966b8a39f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 06:35:10 2008 +1000
 
     radeon: add wait rendering API
 
-commit 6fc03b7cd9848fd0e4ecd2a00e47994adbcf1a77
+commit 94390c9e6525992947543b2454a316dab51ae481
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 28 06:05:58 2008 +1000
 
     radeon: rs480 fixes for bus mastering
 
-commit f6e43aff68b4468a2494654af85fd6b06f295d23
+commit a5ee27dfe9f8bd7afb9cc71b17b9fa974e8667c6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 27 18:30:15 2008 +1000
 
     radeon: remove unused gem indirect ioctl
 
-commit 499ecda3b9987187b4358df765028ae56f21edca
+commit 6f97124a02c3626cb61ef2f1b78cd176f5416414
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 27 16:41:09 2008 +1000
 
     radeon: fix some warnings
 
-commit dd2dd1c785c96992eec1e9fd9aa8f86d1dcfee12
+commit 03c6df6aee0ec3dd74792095c3a76ba9c8d4c202
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 27 16:40:34 2008 +1000
 
     radeon: fix free after refcount
 
-commit aab11a07d253057640785970c30d9973568def25
+commit edd2450f15a75a9bf2c1b508d9c67c49b6389ca1
 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 0bda9dc8e8c26de54e29c72a8353821f544317ac
+commit 933b7c51a0d2af7ecf1d6acb31ba1c48f01c6eba
 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 07dc959e7930290a5b7081bbe6770271d23b0328
+commit dcef65486c00e1472fe156d44d8288ed33c95f10
 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 36204a1b2c0c3ede0cedb4fc348c8178a909223d
+commit 2535b4f528c75882fba11553fcc39f00b8a1681d
 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 c1e7240ad71c86202cfa863c3f95e7ba363b0f01
+commit f4462cd62e283853ad5d447edf8c7ce12a615748
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 23 19:13:50 2008 +1000
 
     radeon: release agp on module unload
 
-commit e4615d75cf62d99ac190d908ba74cf44c4ec25d1
+commit b9a4670303e0d2dfc24f89d049dc652ae599794d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 21 14:15:23 2008 +1000
 
     radeon: add r423 bits to modesetting
 
-commit e48b2e969cd14985b8728f808f68c11612b727bb
+commit a92b7a67a4ba4af1a4e6c89059790a04815bcf62
 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 6989051ed3b1af86557e6999bd7c6d23efa0babe
+commit 52331868a40273625ab2ae31e6780d2d44baa5ea
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 14:44:23 2008 +1000
 
@@ -298,67 +312,67 @@
     We actually were passing accessible to userspace, but I thought
     the code sized it correctly, however it doesn't seem to.
 
-commit d1ab3fbd20b79f745a4402ffae94804dcab5aedb
+commit 94692d71aa8c6ecc26910437c3edc42d24c6cb7e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 13:41:05 2008 +1000
 
     radeon: update proper chip family
 
-commit 8c06879a19b800b435701c8adc9db14b3b771da6
+commit ccd9746f3dd4fa1cde629ed7af16bd911f1b7e25
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 12:08:50 2008 +1000
 
     radeon: fixup scratch register interactions properly
 
-commit cb5db885c28af8519d84fd0085a94d0cc47915fb
+commit 52a8a5890d9779b5d43e50a173843341e5b0a73d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 10:27:50 2008 +1000
 
     radeon: make writeback work again
 
-commit 5f40ee172f2013caaafc402705c7e70fd3a1b514
+commit d3e6a1ccdf8190cc8bac85315b71d8a3ea237bc7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 20 09:20:23 2008 +1000
 
     drm: cleanup some warnings
 
-commit 8299d8dc54b19303dc91f41b9393ad0de7669216
+commit 7f605479ca27655593bd7859bc7ae32485d67840
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 16 16:29:08 2008 +1000
 
     radeon: fix small typo in agp code
 
-commit 3d5bf9e4c85a019ccd495c9d633ff83bce7ad2f1
+commit 221d35a64b90443d34053d837d9e9ff60ac327a3
 Author: Dave Airlie <airlied at panoply-rh.(none)>
 Date:   Thu Oct 16 16:17:01 2008 +1000
 
     radeon: workaround failure to parse some rs48x edid
 
-commit 46c1be616e4da5a0bf284d280f2e231f45d3f85d
+commit 267aae9c7fe74aec8e71dec8c18c5238a795a50d
 Author: Dave Airlie <airlied at panoply-rh.(none)>
 Date:   Thu Oct 16 16:15:08 2008 +1000
 
     radeon: don't enable dynclks on rs48x
 
-commit 12cef8fd78ba51b8a24a4edf5bf6dbd267863274
+commit 954e8d1450b397a0eca7da3ea4e2920eecacf9d2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 15 15:12:20 2008 +1000
 
     radeon: allow r100/r200 modesetting to be forced on by users
 
-commit 2a64731cb28d46bfb536e07685390ddecc832cff
+commit ef367e4bb45565cb9326dfdb4497027ee5357cf4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 16 22:06:00 2008 +1000
 
     radeon: fix unused agp functionality
 
-commit 8dbfc27cb7f40916db19cb857e3c0117f2c6e14a
+commit c540a49adfb58be957c6352bb3bc961241c91d32
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 16 22:05:02 2008 +1000
 
     radeon: add some more r100 support to test AGP
 
-commit 117145aae87ecb89975c7464fbf69188a5f110e9
+commit 5f01ff6b1905275e60e757a98ff4df658cc25116
 Author: airlied <airlied at redhat.com>
 Date:   Wed Oct 15 23:58:03 2008 +1000
 
@@ -366,55 +380,55 @@
     
     This add agpmode command line option.
 
-commit 51753209cf6d577625374811dec3a857de6cf176
+commit 0cd0b0a56cb0cc11910e0f14b12d8746a586c2fe
 Author: airlied <airlied at redhat.com>
 Date:   Wed Oct 15 23:57:21 2008 +1000
 
     radeon: add CS support for r100/r200 in 2D driver
 
-commit f3f950b72e85bd1ce2da8a04681222ab39eb297d
+commit 7a971567e26b556c5ece67bf87e1a20a271a12a4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Oct 9 16:37:23 2008 +1100
 
     radeon: fixup interrupt suspend/resume
 
-commit 8ccf426612ce2261b7625b35d903e2c5291e0f58
+commit ef690a48f8574d54e788dafa9b0e0edde8356282
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 8 16:57:12 2008 +1000
 
     radeon: fixup suspend/resume bus master enable
 
-commit 9e66d7682d08f75a4eba02ad04ac5f41db75860e
+commit 53f1c0037545ba24be003f695f076a67180af598
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 8 16:56:04 2008 +1000
 
     radeon: re-enable hw blits for copying from VRAM
 
-commit 216ae2d9263648ffa5ab579d650ef4c5d1712795
+commit 465a1e2116185f221ce1e2807ece5898d1d6638a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 8 16:53:43 2008 +1000
 
     radeon: fix buffer copying for VRAM->TT
 
-commit 52b41e9b3ef209a1c14c970e986f80a034ae4c3e
+commit 0a3b1a2134b93904ee76651d3396c9f266bec8c6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 8 16:51:58 2008 +1000
 
     radeon: move memcpy until after CP is stopped
 
-commit e738e69edfe5fbdaded95ac4a73e2c7e7702bf0b
+commit 442d6610f1b7403c47f21842aa20a0e372177e8d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 7 16:34:12 2008 +1000
 
     drm: remove stray debug code
 
-commit e28a4f1759c1b9d66b86acf3e99d4a74c3206418
+commit 72004549d0ed3c167c22510c0d75f9928a33e0b7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 7 16:31:22 2008 +1000
 
     radeon: use discardable flags on no backing store objects
 
-commit ebb82fd249aec7f92b0923b4230ec797ba729f95
+commit 2aa4676d07f3b3cf31f8e1a20f190ecb339a4aa0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 7 16:30:09 2008 +1000
 
@@ -423,7 +437,7 @@
     This discards memory contents on suspend/resume with the
     hope the upper layers know something we don't.
 
-commit 2d3462a8e98a0b090c8bda9dfac73e4d8137c704
+commit 27e42a2eb37ea747e62d05fc0cec7fb9c3bd9d12
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Oct 7 16:27:31 2008 +1000
 
@@ -432,7 +446,7 @@
     This enables the evict code and also sets radeon up
     to allow evict from VRAM to LOCAL
 
-commit 3ae87b1c9bd914b56bfdc98a695f55234ab83ead
+commit da3fa2aa492458cb567f033b02fec4ab988423bf
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 6 16:20:38 2008 +1000
 
@@ -440,31 +454,31 @@
     
     fixup the interface between gem and ttm for alignment. makes Xv work better
 
-commit 25149fe0654fcd5931c9defca8c6e38674cb1d72
+commit 9ac157112cebc658937c924304ece26fe6c89ae8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Oct 6 12:10:05 2008 +1000
 
     drm: fix kbuild export of drm_mode.h
 
-commit 8913a3369a0551867382dd0592b58cda82766b62
+commit 31b14dcf822149ca8333d217e056ff339ffc76e7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 1 11:27:02 2008 +1000
 
     radeon: fixup GEM pinned offset retrieval for mesa
 
-commit 2d7b9c387bb997e754b71eed4cc58aa5e008e354
+commit 790ba2cee9cf8c591554bd3a9ffa71ddb1ed2545
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 1 11:25:54 2008 +1000
 
     drm: fixup clean flag handling properly
 
-commit dcb96d31de50c79f8e982652a3d2bb483b2a6611
+commit ae05f1c9c3d6301258aeb82aa7d1ba5d7aefe41d
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Mon Sep 29 14:57:11 2008 +1000
 
     radeon: use atom for ext tmds on r4xx
 
-commit df7679b1e89489f9582a4874a1d75c2c82b6a94d
+commit e16eefcb213996211c64b9997fb3727d636e6f67
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Mon Sep 29 14:56:32 2008 +1000
 
@@ -473,43 +487,43 @@
     default is legacy modesetting.  pass module option r4xx_atom
     to try using atom on r4xx.
 
-commit c97f2dbd194b9ce66ff6d9452335d362281b15a2
+commit c32fe63d91a2a0b531d067ef7e88eb4584771247
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Mon Sep 29 14:55:16 2008 +1000
 
     radeon: first pass at using atombios on r4xx hw
 
-commit 774d8f1bf594aff6a6746e9f80b384534452cf61
+commit db82d42dfb965efead33cad55656ff1e57879c46
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 29 14:50:47 2008 +1000
 
     radeon: add r600 modesetting registers writes
 
-commit 91266b368bf11e1923966225142b432f77610e0c
+commit 14b9dcd3195b06bc0f0a8a15d6e238ee7ac11ea9
 Author: Jakob Bornecrantz <jakob at tungstengraphics.com>
 Date:   Mon Sep 29 14:49:27 2008 +1000
 
     drm: separate modesetting userspace bits into drm_mode.h
 
-commit 0e5472e425d5f214db1a80c7de7ae5e308d7fb90
+commit 38c17ab240e8b23f49864e6654a28d5ab5fa76e5
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 29 14:45:11 2008 +1000
 
     radeon: parse object tables for connectors on r600
 
-commit 9acd22a2130be3e22ea9cf16aa68e17eef826bef
+commit 6c7801bc5b86902a3fc0aaf8e272059fa1bbb147
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Sep 23 16:34:55 2008 +1000
 
     radeon: fix minor cursor disappearing issues
 
-commit 949877e9490423cdaba1cb46fe25303e43186416
+commit 4d139e05f1f340b178698b3456c3bd2b3c55766d
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Mon Sep 22 18:40:36 2008 -0400
 
     radeon: Fix type in check for tmds type.
 
-commit 06530d732f432d5ded0a570b7ceb331bcabbab13
+commit 697a69fe67dd67fefcbb47b745ddadf67ed7e352
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Mon Sep 22 12:00:57 2008 -0400
 
@@ -518,31 +532,31 @@
     This lets us defer handle creation until userspace acutally asks for
     one, at which point we also have a drm_file to associate it with.
 
-commit 3fb003d27c12868cad09e0ff37348fefc62a24a9
+commit 9a5312255f29d7a6891b356249cec41fe7c0c27a
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sun Sep 21 09:48:51 2008 +1000
 
     drm: fixups on top of rebase
 
-commit 37397efb9f3f3e4da5b79c65d3b88cfedc81bedb
+commit c10427bc83e6d3e44dde172ca4b02be6edfce6c9
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sat Sep 20 03:08:05 2008 +1000
 
     radeon: rmx_fixup() fixes for legacy chips
 
-commit 7a56e2edc212dea864d34caabce6ffd36994dc7a
+commit d900c30be3a23efa608d4aeb8fe3273b18634b16
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Sat Sep 20 01:55:27 2008 +1000
 
     radeon: fix combios
 
-commit 57268ec8c60d863121d39dccb9a299649f8265a8
+commit bd43b68c04f84b0f680cba22929b47ea8994c2dd
 Author: Dave Airlie <airlied at linux.ie>
 Date:   Fri Sep 19 09:17:36 2008 +1000
 
     radeon: port Alexs patches from modesetting-gem
 
-commit c0f54ecbc0d9323292ea24a78527603302ebb20d
+commit 4fb4c9243ccad7c1d8cafe641a752dc93a65cfca
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Thu Sep 18 16:10:29 2008 -0400
 
@@ -551,7 +565,7 @@
     Shouldn't trigger under normal use and when something breaks, it will
     be easier to debug.
 
-commit be77e3b16609277ced0b0d421474d761e5eb246f
+commit 1d0d4dfea459233a68672287bf6df219d9caae0f
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Thu Sep 18 16:07:50 2008 -0400
 
@@ -560,25 +574,25 @@
     The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
     accel init.
 
-commit d1685bbc3a03601dfb31b553b22fefdea686afa7
+commit 6ac0f8df8dc7072ad75f4259cf965189d7b173f4
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Thu Sep 18 14:53:46 2008 -0400
 
     radeon kms: Get precedence right when computing PLL values.
 
-commit b6a08d57255205ca1a777e525199a25c23b00d42
+commit 559bc855adbd7e2de8ca0f7883304925b036c8ca
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Sep 18 09:55:14 2008 +1000
 
     radeon: further LVDS fixes
 
-commit 4d2c6fbd6ee0c2b542981369effaf75d33d2ea2e
+commit ccbc88ef2776bf4f440fd02ed5792204a65b9500
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Sep 18 09:54:12 2008 +1000
 
     radeon: legacy lvds updates
 
-commit 88ad6232151c6ade59d0b2cbeff15fc97f2afb3b
+commit 926ff3aaf29f3c8429dd7c7ca66732af1788d383
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 18:26:27 2008 +1000
 
@@ -586,7 +600,7 @@
     
     just fallback around busted stuff for now
 
-commit a9373d20772edf913e826b7bdcde263f8e79a392
+commit 2d3b0a31653310c57ceaf431601885cd3182369f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 18:25:18 2008 +1000
 
@@ -594,13 +608,13 @@
     
     also dirty buffer on validate
 
-commit 32ef4556624102d654915201dab589d768b854c6
+commit aefdba67e5d95a57d4bb6583964663626ed36ac4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 17:13:32 2008 +1000
 
     radeon: disable blit moves
 
-commit 8a95fb20ff7b1c9fc40cdef75bea8897d4dd6628
+commit cbe859c2f80618cb4f2110b96bd476bd82519edf
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 11 16:18:27 2008 +1000
 
@@ -608,73 +622,73 @@
     
     Normally this will be due to an AGP driver needing updating
 
-commit 55d620177b4c376d9efa461c916b80d5dfca6d35
+commit bfe72bb97eaa3b58f034ab1a1f78416810369eab
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:35:43 2008 +1000
 
     radeon: do proper memory controller init and setup
 
-commit d43c30dcd5be4fee4e5d9dfe5c2e3b5fd037b0a2
+commit 28f4711d196256422914ea4e0cbec17d969ee40f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:35:08 2008 +1000
 
     radeon: fix return value
 
-commit afbef148b2b001790bda173d0039aca831b45f00
+commit 785f962b8b6096324eae5d918c9ba7794ef99e69
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Sep 10 14:34:39 2008 +1000
 
     radeon: fixup reference counting properly
 
-commit d30f521d983f304aa744724910a0d1be354fa8e2
+commit 3900200089af59599f3ef1fcf5461dff320d01b2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Sep 9 15:55:38 2008 +1000
 
     radeon: sort out atom vs combios tables for r400 cards
 
-commit 1822deb5f60b32e91541ee90b82d779d7d2f5135
+commit cddc62790ba7f48aabea09fda4781a2be1d194b0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 11:37:26 2008 +1000
 
     radeon: remove unneeded debugging
 
-commit b046eda517ff4500ed522ec381493b80efef9e27
+commit f4f86592f4d444b3f470944cc8224bc07986d751
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 11:25:12 2008 +1000
 
     radeon: don't do full edid for detection purposes
 
-commit 0deac7df76f200f96ef19931b93482c5dc358b3b
+commit bfdc520958b528bb906ce58d4b47ff4730adea87
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:27:48 2008 +1000
 
     radeon: disable debugging that sneaky itself on
 
-commit 872d2b30e448fcfb3f23b18165f03a212870e9c1
+commit 7c196b8163a071f6d36c07af22998b09ca904d48
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:20:44 2008 +1000
 
     radeon: make text reserve 256k
 
-commit 1351756b1941fa6b6b91900005412498add8eaf8
+commit 34bf845293a582aabbbb749379d3826ecd028ff3
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Sep 8 10:11:27 2008 +1000
 
     radeon: don't disable VGA bits it breaks X later
 
-commit a1a749b459956e336d6647a45f1fc8e1bd2cdd95
+commit 795ae723e8961a74d4f0231183dc85543ce02ec6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:26:55 2008 +1000
 
     drm: export drm_i915_flip_t type to userspace to build Mesa
 
-commit f6492f3013fdaec8b88cd27135307b5b5da1b02f
+commit f90df56a797a12ee2aad20fbf2aa0e8cefb2398e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 16:12:59 2008 +1000
 
     radeon: further suspend/resume support
 
-commit aef64c209b47727e7d4001348511941e3b44902e
+commit de93412674cdcb59fcb8ed028b7f3c463d53376e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 29 14:52:15 2008 +1000
 
@@ -682,19 +696,19 @@
     
     this gets us back to fbcon.. its dirty like zebra
 
-commit 70711c100aa8e593dfffc6523e8bcbb42b079124
+commit b2028d7b95cc21a57e440ca3d614a845ab47d077
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 29 14:51:46 2008 +1000
 
     drm/modesetting: add helper to force restore modes on crtcs at resume time
 
-commit 6a0a49d9bed9a595a9092bd576933637389e06a2
+commit 13d6ef9d8b7c68694e324491bd041dc5f74ad47c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 11:15:03 2008 +1000
 
     radeon: only enable KMS for radeon on x86 for now
 
-commit fb44a5d774c2d0b4623dbfcd1d8997b50219d44f
+commit 29d1e9a24a00034e81fcf421cd586c67e28f5664
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Sep 5 10:46:17 2008 +1000
 
@@ -702,13 +716,13 @@
     
     Allocate the rs480/690 tables from uncached memory.
 
-commit ed09fb9f4a647b2132df3d2b73e09c609de8aed5
+commit a9fe1fa367b93fbb91e2b94fbc8567c95c37b389
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Sep 4 11:58:08 2008 +1000
 
     drm/radeon: fixup some avivo/rs690 checks
 
-commit ade460b45316ae84a8ec33995e6c2b947fabe695
+commit 39a6c7fc4051b538f9915f1ec9a9f724efa20c48
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 29 09:59:02 2008 +1000
 
@@ -716,7 +730,7 @@
     
     also change name from text to nomodeset
 
-commit 64640190f4f4c4f7bfaa38e5c90e939b4b3561ef
+commit 5c8cfcca48053a34f95b49dc762a2cd08148711f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 21:22:27 2008 +1000
 
@@ -724,13 +738,13 @@
     
     also don't explode on lack of DDC
 
-commit be382308b2bce94390f94392c6b2683fe475ed37
+commit 649675ebb5f6654587d73a23a8eae78b5ef07370
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 18:31:50 2008 +1000
 
     drm: fix dev->master convert
 
-commit 705f5342ee7f84a763e72eff1fa85f22c3bcfede
+commit f737d146f1f3287d485d970e6f217de6a3f7ebd9
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:26:11 2008 -0400
 
@@ -740,7 +754,7 @@
     
     Signed-off-by: Kristian Høgsberg <krh at redhat.com>
 
-commit 6e24abb999fd694a0dda1296cc011878ea8c92ce
+commit e2c4fd1dedc4e0365c07eb88ef5225d2be9b1746
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Wed Aug 20 11:24:13 2008 -0400
 
@@ -752,7 +766,7 @@
     
     Signed-off-by: Kristian Høgsberg <krh at redhat.com>
 
-commit eb35595966afa02ea9f01b3f73ae6da4525c02f6
+commit d9b3206c40969ab2f07f8059413aaebf268e441d
 Author: Kristian Høgsberg <krh at redhat.com>
 Date:   Tue Aug 12 22:39:54 2008 -0400
 
@@ -765,13 +779,13 @@
     
     Signed-off-by: Kristian Høgsberg <krh at redhat.com>
 
-commit 50292e0182e8404a386d485b30e86589cab9bce3
+commit 59077b5ee03faf91024028de50e75ae1b3ca1f1a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 16:38:49 2008 +1000
 
     radeon: fix LVDS on atombios - typos
 
-commit aee6a6a04cc8dd1a565f9f505da8a98ff3d4d47d
+commit fed02f7782eabc3e92c0601cc81e7e99218330c9
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 16:38:34 2008 +1000
 
@@ -779,43 +793,43 @@
     
     This should do a better job at picking the initial configuration crtcs
 
-commit ad961746eb89b30ae379585b1aace47c3a1614b1
+commit 72f7b5697d72627f994e3cc8b68debaee927597e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 12:01:53 2008 +1000
 
     radeon: limit LVDS to first CRTC for now
 
-commit 36a0a9c8e8fa96268f1ba99150edb3e74abcc0ab
+commit 6f78cf0981ab462bb94f9737d35734f19c61e9a1
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 28 12:01:38 2008 +1000
 
     radeon: fixup checks for crtc in dpms path
 
-commit 7b2d62828b133ad3ece78dcb5019bf00e000ac65
+commit c31ee74ed9fc3b98ce42241677c8ce0e154b7797
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 15:39:17 2008 +1000
 
     radeon: fix after rebase
 
-commit 2d7aece826b79983af92d90b4edd634aa83b4d69
+commit c3d58fc173ec5498834805057ac974bfa2393ec6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:23 2008 +1000
 
     drm: fix whitespace
 
-commit 9210a306b1fb5405aae609815ecca850d873c973
+commit c12fc27be229d9b439c16261b398f9860f6b3b22
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 13:43:04 2008 +1000
 
     radeon: avoid oops on encdoers with no crtc set
 
-commit 3815394c6b47b5850943651c58cc1ace1098b091
+commit cd2378af5d057e1c88d978613edb56a3a046d163
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:23:21 2008 +1000
 
     radeon: fix warning from radeon_legacy_state removal
 
-commit 772b469fd43dcc2256ddc5eadd2d9d40098214f9
+commit 281509f0606fba332926bf209ffd5c2b3918906e
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:37 2008 +1000
 
@@ -824,7 +838,7 @@
     - done: primary dac, vga on tvdac
     - todo: ext dac, tv on tvdac
 
-commit b7e65caa902c1ee884dfa07994fcdc7ccbcb7ac0
+commit 06373e8128ef61ebf6a9c2d6fc931969042edd81
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:22:11 2008 +1000
 
@@ -832,25 +846,25 @@
     
     - todo: updated connected status
 
-commit a7edb362b10c5a6ca144d0dc1e530a31b7ad919b
+commit 7878013542931529e9d85266d38e5f7ce3a9b0ef
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:54 2008 +1000
 
     radeon: remove unused legacy state
 
-commit 0f9931f44e3800cc94f6009f9835eeeafbbf349c
+commit 21acdaedb44172174a1b3da73311e1137f1e98ee
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Tue Aug 26 17:20:15 2008 +1000
 
     radeon: get primary dac adj info from bios tables
 
-commit 1b0ca84f2ab4916bb1e3d47beaab4eef2885ede9
+commit 6d09134f8e0c13439d48ba914e83024df95dd732
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:03:13 2008 +1000
 
     x86: export pat_enabled
 
-commit b5bb0a19b30d74874687f3285f2809f2d1e0421f
+commit c10a45a6acc6420ca682a017d19f756f862c38d7
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:02:43 2008 +1000
 
@@ -859,7 +873,7 @@
     If PAT is enabled, enable write combining support for kernel/user mappings
     when pat is enabled. Also set memory to WC instead of uncached in ttm
 
-commit 0dd15b78f6dfe2de01cc406e5c625d3fe10c25ac
+commit fe9106c6b5e7709338c98325f974b0248229ab6f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:01:35 2008 +1000
 
@@ -868,7 +882,7 @@
     move domain validate function to separate function
     call it from correct places
 
-commit 7a045a13aede7eb3aea8c6f68a2fcb717c9bcbe2
+commit 18a6de6280aba92c84f6d5e04d8e21ace5ac1262
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 17:00:49 2008 +1000
 
@@ -877,37 +891,37 @@
     If a BO hasn't been dirtied, do a solid fill on VRAM instead of
     migrating pages to VRAM
 
-commit 6685d386d99455ab91fb4217c9170ba09ba23b5d
+commit 65780bbf75751d212743734b7c9610049958de6e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 26 16:59:45 2008 +1000
 
     drm: set clean flags in new flags so it doesn't disappear
 
-commit 6f68b63c9a8c53c8ccf8caf9d90957127cbdbf70
+commit 76e9eea78a8e28bed2f6c44fc07184df564bcf5e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:16:20 2008 +1000
 
     radeon: wait for dma gui idle on 2D idle
 
-commit 84125e8270731c0b7a454641dd2f04ad16a309fb
+commit 8f3e51e58bcb6537e0c82aaf4d560aabead399dc
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:16:01 2008 +1000
 
     radeon_gem: fix some misplace ==
 
-commit a5acdeacc02faf3b22a3eba8877ab5285a7f03af
+commit f174e11fed8c56a1c99c616d2e26af3cdde50daf
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:13:25 2008 +1000
 
     radeon: get buffer upload working
 
-commit 7ff2ce5a4d648a655786680b9c3d82d938a6d60c
+commit 15ef92b2c70ac002d337f055969429c3c76775b6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:12:57 2008 +1000
 
     radeon: read back register between on gart flush
 
-commit 708e7cfcf20d109a3927980520517895d6555ea7
+commit 7f0e2ccc44d2408e8319f4c0d641be1905359dae
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 10:11:55 2008 +1000
 
@@ -916,7 +930,7 @@
     We need a buffer zeroing function for before we have
     accel running etc
 
-commit 0044d0ac76abad65153a5147a452d364dfa52e3d
+commit 1ed6c585d5c74e001efbe62c31a8e0b17642ed1d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:49:16 2008 +1000
 
@@ -927,49 +941,49 @@
     Primarily for the move code when we get a buffer in VRAM, we don't need
     to copy the contents just zero them.
 
-commit 926a5bb8c9508cd72e88167ce9a35ef4e07431c8
+commit ed7df3f06f63acfff0f7d923ec5a9e4f893844de
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:39:07 2008 +1000
 
     ati_pcigart: add memory barrier and volatile for table access
 
-commit 8663f9cd2b919fb2f07638101923b838ba1bd3de
+commit 9f4fc06c539fc8dfb158023780b9093946032885
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 22 09:35:26 2008 +1000
 
     drm: remove tlb flush logic from ttm
 
-commit 82e5ff60b7a209ec777286146aa0286c9868d194
+commit 202b58bd783dca06a603cf81fdc11fec20812c89
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 20 09:56:33 2008 +1000
 
     drm: edid don't probe 3 times because don't
 
-commit 511ba7e25e86ea323de77a2c98e7ab936bb79292
+commit b7f442cb53e70adbc363494665487af5d12ff5b0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:16:13 2008 +1000
 
     FEDORA: add radeon copy root patch
 
-commit f3a1bdb084323888d975267378c52e862f09c69a
+commit c3200fae7937e6a0339e59fcc45098255bdc9041
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:15:10 2008 +1000
 
     radeon: fix bug in scratch retreival
 
-commit c1394cf9443e96498e7c11420483414ffde8bda4
+commit 89a66b690dd4d452de8b0674342c57367188ccda
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 19 12:14:38 2008 +1000
 
     radeon: add GTT domain
 
-commit 1d674273ccfdd76a62ada9cf46733528030068db
+commit a45d10c17123af9756c9d9d36c966ff596386390
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 27 14:58:05 2008 +1000
 
     radeon: add missing regs from a previous rebase
 
-commit 43293152e9e0e8f9e76905ef7232ea2fb4f2c483
+commit 08ccc35ff5b76149c1ed1a9f45e66d6356241f7e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 14:28:43 2008 +1000
 
@@ -981,37 +995,37 @@
     
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit f43a57a4079676c0e0efa551d3b55770d4d785bc
+commit de5609a2352cdadc17b6169fec3af1543eff1ba9
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 18:14:56 2008 +1000
 
     disable modeset on < r300
 
-commit f46e2fba27d3a9efe08b22f3ebafadf12e4fa706
+commit d7e861f83d6f01fccdc21171976957a1c220bdb2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 09:36:21 2008 +1000
 
     radeon: set the base after mode is programmed
 
-commit 7060c2de7053220cc085bf90ab83b5408919b695
+commit 9b8d4c26b67bbcb923402b3a793c794aadfa4695
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 15 09:35:55 2008 +1000
 
     radeon: fix LVDS modes problem
 
-commit dbfbebb69c344a245dd70edc8213faa266d5fb4c
+commit 453272e1ba668f6eb755ce6744d91af5bcbd114c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 19:29:03 2008 +1000
 
     i915: fix some missing gem defines for ddx build
 
-commit c9774e58cfb9b823fd08099f8a545e6b558d6216
+commit 0a277dfbfbbe316d5d3c4dfbde1e365e43eca4dd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 18:06:31 2008 +1000
 
     radeon: reserve 64k of VRAM for now for text mode so we don't trample it
 
-commit 21861b023e5beeac9d3cd407c09e6ae6c091725b
+commit 0db218dc113a1e163c9c1e076b85c2872edf127a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 15:23:51 2008 +1000
 
@@ -1019,7 +1033,7 @@
     
     Need to add to Intel when we get there
 
-commit 1de6403fa2b4bd6b2eff4e96bbf099cd47e4f454
+commit 34daa88f3c7fdb02466e080b780c9e7bd662d31d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 14:38:27 2008 +1000
 
@@ -1027,31 +1041,31 @@
     
     This gets RN50 to initialise correctly
 
-commit 799f81052157acae24c777b13727c843ec55ac20
+commit 3eaee9ce962c0607876b088dd33ff17df7e6366c
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 14:37:25 2008 +1000
 
     radeon: add copy/solid regs for rn50
 
-commit 861c9c9d51b4b0cb921566931434a489cf6729b1
+commit 4fd7985fd9180c473aa0882de2b20c8794e826ce
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:59:47 2008 +1000
 
     radeon: fill in and make use of more combios tables
 
-commit 53cb4a311a6674c61d28a0391723cc2e87868191
+commit 76f0e4e10e193e57632d4b7cde428ddc4f59b47e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 09:59:31 2008 +1000
 
     radeon: add quirks from DDX
 
-commit 9042a4a3f94f117c195f32e7b1dd96d72bd7a86d
+commit 179163f593237ef65e695bf21982fa708f31c8fc
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:59:12 2008 +1000
 
     radeon: fix warnings
 
-commit ee26c713c83adbc864476925818adcad61785786
+commit d0dd7fd730fd88f64124931ef25abf5e05a1c72e
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:58:47 2008 +1000
 
@@ -1062,31 +1076,31 @@
     - add debugging for tracing calls
     - fix pitch calculation
 
-commit 22e0475b67f09b9f08ea13505504b46a786c08f5
+commit 4636d389c4966d86686577add4a334a96980b473
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:58:24 2008 +1000
 
     radeon: set base in legacy crtc mode set
 
-commit fadcf4a81f99df989b080dc0cca66b35d8885bbf
+commit a5539f4784b6fe88973c1a8046301a7d7ca36af5
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:55:06 2008 +1000
 
     radeon: Convert COM BIOS to table offset lookup function
 
-commit 033ffe98853f45e18ca9304414f3dbbfdc2b2d24
+commit f7776998ab66a1bf00dc0c367ff70165b9b88881
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:54:03 2008 +1000
 
     radeon/cursor: Restructure cursor handling and add support for legacy cursors
 
-commit e23736022f4f20765c5e28655b2073dabea931e7
+commit b8fa51978f9de79e2f77581568b07f6f92d10288
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:53:08 2008 +1000
 
     radeon/atom: implement crtc lock
 
-commit 6d5fbf936fc0c6a766e149687ed123fd5f0da258
+commit 31ca3d0795c75aff1452fae4973297410e6f18b8
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:50:15 2008 +1000
 
@@ -1095,7 +1109,7 @@
     - Add gamma set for legacy chips
     - Add 16 bpp gamma set
 
-commit 9d5669bbcfc7ab71b6b19fb5f3457f84e2d306e3
+commit a85d02155f6b3d3b802309e1d1386503c333a8d0
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:55 2008 +1000
 
@@ -1105,19 +1119,19 @@
     - move i2c_lock to radeon_i2c.c
     - enable tv dac on legacy
 
-commit ebf2690b19a0f5ca6c6c744405f596a2d54e730b
+commit 3abfbd31a3176389bbba4d7ee2011b336955a18e
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:30 2008 +1000
 
     radeon: Add legacy dac detect stubs
 
-commit 3844076a9fc2305592cf45c57a6481c3a93ab410
+commit 0920d26c557b5a60d22dc7bea52a9d2faa81eed1
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:49:12 2008 +1000
 
     unify connector, i2c handling for atom and legacy
 
-commit 73dfc29f8130cbccc672fc10ab44e6f69efb3fb9
+commit 9d4a6923b0000d9656a6bc6b6724d9cb8b9ac145
 Author: Alex Deucher <alexdeucher at gmail.com>
 Date:   Thu Aug 14 09:48:50 2008 +1000
 
@@ -1125,25 +1139,25 @@
     
     - removed save/init/restore chain with set functions
 
-commit f24153a1ce8084842dd9fbf84d5e2abffb50572b
+commit 1a0792a75a00b189a04972803a35ec610b78b180
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:54:04 2008 +1000
 
     FEDORA: radeon set gart buffers start
 
-commit 410cb1fb9e874cb3e6681169fc824acd296dbd75
+commit 013cd174dba96a6de4d84220a79fabc0ecc9c9bf
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:52:41 2008 +1000
 
     radeon: command submission remove debug
 
-commit f3a00ad1e57e89ad94fa058b1a57713ec2934467
+commit 05324e03f585bbd3be6e7d588e4b7b4a639f5614
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Aug 14 08:51:00 2008 +1000
 
     radeon: use mm_enabled variable to denote memory manager running
 
-commit 2de8eb9f183d2cee854501284f38afcfe2474594
+commit 2204fd39722bcd7ef03fd8d98b173a3cbbea9793
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 12:19:05 2008 +1000
 
@@ -1151,19 +1165,19 @@
     
     in the correct place in the drm so buffer swaps work again
 
-commit 4803cdcfcb83eff17a54a2c95ca1f75ee13628ea
+commit e43f4588c1f483cfb67b1c9b2f2e3b1c983a55cd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 12:18:08 2008 +1000
 
     radeon: add mm supported call for userspace
 
-commit bdaf9127accd6456a1829d1dd1348520230db03f
+commit d4a4322e03a709993f2ee012ccc27709e63db5d4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 12 09:40:18 2008 +1000
 
     FEDORA: add old DMA buffers on top of GEM
 
-commit 08ac9a917739359dec506ac24ed61ef0a998c96d
+commit 838a375824eebf939c93a420fd6a7af4ac468c6e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 15:57:10 2008 +1000
 
@@ -1172,7 +1186,7 @@
     This adds the CRTC and PLL setting code, it doesn't work
     yet but its all heading in the right direction.
 
-commit bb1361a87144e2dff23de3b9ea30e873f7be3dac
+commit da5a8c8a6a53e343dd8cfbb87e6f905a23d1608a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 13:32:50 2008 +1000
 
@@ -1181,67 +1195,67 @@
     In theory we should be setting the mapping for the legacy node.
     the inode for the control node might be different.
 
-commit 0468d9968b9c1ae15633c3d5e51333bc56060b37
+commit addb6ad477cf0594541191e6802bf13231033cef
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 8 10:11:23 2008 +1000
 
     radeon: add initial tmds parsing for legacy cards
 
-commit cd47ccd114aeb6b9726f366fae154c7ab918fff0
+commit 11686fc1c9af6d59fcc484fc344ab2378d43745e
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 16:01:22 2008 +1000
 
     radeon: set new memmap on gem enable
 
-commit c9b28fd45bae0b2e64286be11e735247b1a53328
+commit 6e7dc657cdb0e1e12853d200472f6352e425b57b
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:51:02 2008 +1000
 
     radeon/pci: fixup table when GEM allocates it
 
-commit 25bf351f6a238c560d48f1c8f67191e4a4e9b5ce
+commit 071a073fbb2acbe830dd4fa786eb05f0474948f6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:44:38 2008 +1000
 
     radeon: set gart table size
 
-commit 6d592a2f4d07241ffd0803ec9c6e9d2c94bc091f
+commit fcf49c9e160b52f17c724a346542306fe4e87b7a
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:44:18 2008 +1000
 
     radeon: fix buffer evict slection
 
-commit 609beca085a4fd22f68c4076ac91d5e0b52b0ad1
+commit 5b4757f2f5fc7f11fad67ce2cac53c83dffc28a4
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Aug 6 15:43:51 2008 +1000
 
     pcigart: fix incorrect memset + no need for wbinvd
 
-commit c6d4ee8cd37735b6a6e03a232a90b7d9a009a4b9
+commit 648bb026d5b8b402eb56b3a6fa8ae99178377c04
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 5 15:01:02 2008 +1000
 
     drm: don't tear down certain things for modesetting drivers
 
-commit d186782e11baf2692d9aa4d097ab213964bd0ed0
+commit 1942ee498d0c5122dc2db1167d516f0307199173
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Tue Aug 5 11:22:24 2008 +1000
 
     radeon: fix defines so blit works again
 
-commit f22d277c32c2f7e1ccb2dbdebddfd7510ce4e8cf
+commit 262f153d005bdf2a92211bce16cd5a55e9b44ea2
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 17:10:35 2008 +1000
 
     drm: leave bo driver finish to the driver
 
-commit f371869b02f121ab5b18375d1e86ca06ba72a37e
+commit ce0809ddf355edc21b3353638cca0066c4c8435f
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:21:22 2008 +1000
 
     drm: fix unneeded debug
 
-commit 77e9159a542df04fd48c39929174c9e9c6db8d5c
+commit 8cc9be2d095d1cb3146d5fe932d54a79d024457d
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:20:47 2008 +1000
 
@@ -1249,49 +1263,49 @@
     
     if kms enabled memory manager will be enabled by default
 
-commit 4bdb370fb98bc251955b7ce626e70d4af3e32bcc
+commit 4d5df5c134c0fb7cb8680152bff0993e2a8d79e8
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 14:20:26 2008 +1000
 
     drm: kill bo after driver lastclose
 
-commit f25fcb7ba3388899751905eca604c9b1bc1c1367
+commit 2441bde9274e38b497fd7e0f5a4c8900991cbba6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Mon Aug 4 11:32:45 2008 +1000
 
     radeon: don't invalidate cache if CP isn't running
 
-commit 92ebbe966a4f508c38ae65a8dc4243de031695d7
+commit 632133c986908ebd2c9dedbc033202ed9c94e9c1
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sat Aug 2 08:06:26 2008 +1000
 
     drm: fix release locking
 
-commit 8e54dae0ba16874c9dd1b970998c63bc019e13e0
+commit 3e88e208dc58abf1a07706cc1ea843b5c6a9acd0
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 23:39:24 2008 +1000
 
     fix build on powerpc
 
-commit a11d814a80e0e311e3be57775c964e129f1341e1
+commit e49aefaf64778eadec602027bd347a5b84014769
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 16:55:34 2008 +1000
 
     drm: add radeon modesetting support
 
-commit bb5f257b3f1f5e05a2117a0b09e680f577949ce2
+commit 7d977999ce46f9b824c16e743b1d3f2497e45005
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 14:07:35 2008 +1000
 
     drm: add modesetting support
 
-commit ae0e96e07e1722ec9922aaf9588f9db5376f660f
+commit bcb5d1dd38bf9b3ed2e1a55f1311c113c1caf7b9
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 14:06:12 2008 +1000
 
     drm: add TTM VM changes
 
-commit be1735f6996e37d796d3b45d8cc282f8e8a63d95
+commit e3ae45bbcd6ddc107ce9dfa47a429922b256e3c6
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 11:24:36 2008 +1000
 
@@ -1299,13 +1313,13 @@
     
     This adds the control device nodes also
 
-commit 6d29ce7fa4b9afcd84e66560eced8b0c1de5bc97
+commit a93edf761e8c3db101aaa0f4f113cf87f591bff1
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 11:11:06 2008 +1000
 
     drm: add set/drop master ioctls
 
-commit d6a76dd32c08ac8f182a1ead7afa01ba91f94701
+commit 46bd4453d68f6c8651672ca4cd2406983ef15e38
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 10:23:57 2008 +1000
 
@@ -1315,13 +1329,13 @@
     
     Signed-off-by: Dave Airlie <airlied at redhat.com>
 
-commit 7aaf3029c89e37bf493685d3a6047da93e22d007
+commit 5e7eb1387349860a143dd0ef404685d695a09015
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Fri Aug 1 10:23:40 2008 +1000
 
     drm: make sarea_max unsigned long
 
-commit 940a73aa0cf8d70cdb17d969bfad0633732212bc
+commit cbcc953b7b574efea10d75c03635e2c808b836ee
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Thu Jul 31 15:27:27 2008 +1000
 
@@ -1994,7 +2008,7 @@
  	return -EINVAL;
 diff --git a/drivers/gpu/drm/drm_bo.c b/drivers/gpu/drm/drm_bo.c
 new file mode 100644
-index 0000000..3d7c623
+index 0000000..68212d5
 --- /dev/null
 +++ b/drivers/gpu/drm/drm_bo.c
 @@ -0,0 +1,2119 @@
@@ -2776,8 +2790,8 @@
 +	}
 +	drm_bo_add_to_lru(bo);
 +	BUG_ON(bo->priv_flags & _DRM_BO_FLAG_UNLOCKED);
-+out_unlock:
 +	mutex_unlock(&dev->struct_mutex);
++out_unlock:
 +
 +	return ret;
 +}
@@ -3225,7 +3239,7 @@
 +					 move_unfenced);
 +		if (ret) {
 +			if (ret != -EAGAIN)
-+				DRM_ERROR("Failed moving buffer.\n");
++				DRM_ERROR("Failed moving buffer. %p %d %llx %llx\n", bo, bo->num_pages, bo->mem.proposed_flags, bo->mem.flags );
 +			if (ret == -ENOMEM)
 +				DRM_ERROR("Out of aperture space or "
 +					  "DRM memory quota.\n");
@@ -12885,7 +12899,7 @@
 +	master->driver_priv = NULL;
 +}
 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 654d42f..a16fce3 100644
+index 047b9d7..d0bb829 100644
 --- a/drivers/gpu/drm/i915/i915_irq.c
 +++ b/drivers/gpu/drm/i915/i915_irq.c
 @@ -168,6 +168,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
@@ -12894,21 +12908,21 @@
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 +	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
  	u32 iir, new_iir;
- 	u32 pipea_stats, pipeb_stats;
+ 	u32 pipea_stats = 0, pipeb_stats = 0;
  	int vblank = 0;
-@@ -205,9 +206,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
- 		I915_WRITE(IIR, iir);
- 		new_iir = I915_READ(IIR); /* Flush posted writes */
+@@ -201,9 +202,8 @@ msi_interrupt_again:
+ 	I915_WRITE(IIR, iir);
+ 	new_iir = I915_READ(IIR); /* Flush posted writes */
  
--		if (dev_priv->sarea_priv)
--			dev_priv->sarea_priv->last_dispatch =
--				READ_BREADCRUMB(dev_priv);
-+		if (master_priv->sarea_priv)
-+			master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+-	if (dev_priv->sarea_priv)
+-		dev_priv->sarea_priv->last_dispatch =
+-			READ_BREADCRUMB(dev_priv);
++	if (master_priv->sarea_priv)
++		master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
  
- 		if (iir & I915_USER_INTERRUPT) {
- 			dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
-@@ -252,6 +252,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ 	if (iir & I915_USER_INTERRUPT) {
+ 		dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
+@@ -246,6 +246,7 @@ msi_interrupt_again:
  static int i915_emit_irq(struct drm_device * dev)
  {
  	drm_i915_private_t *dev_priv = dev->dev_private;
@@ -12916,7 +12930,7 @@
  	RING_LOCALS;
  
  	i915_kernel_lost_context(dev);
-@@ -261,8 +262,8 @@ static int i915_emit_irq(struct drm_device * dev)
+@@ -255,8 +256,8 @@ static int i915_emit_irq(struct drm_device * dev)
  	dev_priv->counter++;
  	if (dev_priv->counter > 0x7FFFFFFFUL)
  		dev_priv->counter = 1;
@@ -12927,7 +12941,7 @@
  
  	BEGIN_LP_RING(4);
  	OUT_RING(MI_STORE_DWORD_INDEX);
-@@ -300,21 +301,20 @@ void i915_user_irq_put(struct drm_device *dev)
+@@ -294,21 +295,20 @@ void i915_user_irq_put(struct drm_device *dev)
  static int i915_wait_irq(struct drm_device * dev, int irq_nr)
  {
  	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -12954,7 +12968,7 @@
  
  	i915_user_irq_get(dev);
  	DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
-@@ -326,14 +326,11 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -320,14 +320,11 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
  			  READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
  	}
  
@@ -25906,10 +25920,10 @@
 +}
 diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
 new file mode 100644
-index 0000000..302dd93
+index 0000000..69a0f05
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_cs.c
-@@ -0,0 +1,609 @@
+@@ -0,0 +1,615 @@
 +/*
 + * Copyright 2008 Jerome Glisse.
 + * All Rights Reserved.
@@ -26060,6 +26074,12 @@
 +		goto out;
 +	}
 +
++
++	r = radeon_gem_prelocate(&parser);
++	if (r) {
++		goto out;
++	}
++
 +	/* now parse command stream */
 +	r = dev_priv->cs.parse(&parser);
 +	if (r) {
@@ -26072,7 +26092,7 @@
 +	cs->cs_id = cs_id;
 +		
 +out:
-+	dev_priv->cs.ib_free(&parser);
++	dev_priv->cs.ib_free(&parser, r);
 +
 +	for (i = 0; i < parser.num_chunks; i++) {
 +		if (parser.chunks[i].kdata)
@@ -26157,7 +26177,7 @@
 +
 +	cs->cs_id = cs_id;
 +out:
-+	dev_priv->cs.ib_free(&parser);
++	dev_priv->cs.ib_free(&parser, r);
 +	drm_free(packets, size, DRM_MEM_DRIVER);
 +	return r;
 +}
@@ -27652,7 +27672,7 @@
  }
  
 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 7a18378..ab47d3f 100644
+index 7a18378..7f02b47 100644
 --- a/drivers/gpu/drm/radeon/radeon_drv.h
 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
 @@ -34,6 +34,8 @@
@@ -27824,7 +27844,7 @@
 +	 * sequence into the ring */
 +	int (*ib_get)(struct drm_radeon_cs_parser *parser);
 +	uint32_t (*ib_get_ptr)(struct drm_device *dev, void *ib);
-+	void (*ib_free)(struct drm_radeon_cs_parser *parser);
++	void (*ib_free)(struct drm_radeon_cs_parser *parser, int error);
 +	/* do a relocation either MM or non-MM */
 +	int (*relocate)(struct drm_radeon_cs_parser *parser,
 +			uint32_t *reloc, uint32_t *offset);
@@ -28306,7 +28326,7 @@
  
  #define OUT_RING( x ) do {						\
  	if ( RADEON_VERBOSE ) {						\
-@@ -1443,4 +1623,148 @@ do {									\
+@@ -1443,4 +1623,149 @@ do {									\
  	write &= mask;						\
  } while (0)
  
@@ -28454,6 +28474,7 @@
 +
 +extern int r300_check_range(unsigned reg, int count);
 +extern int r300_get_reg_flags(unsigned reg);
++int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser);
  #endif				/* __RADEON_DRV_H__ */
 diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
 new file mode 100644
@@ -30608,10 +30629,10 @@
 +
 diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c
 new file mode 100644
-index 0000000..2ed9bfc
+index 0000000..0d5dd33
 --- /dev/null
 +++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1608 @@
+@@ -0,0 +1,1672 @@
 +/*
 + * Copyright 2008 Red Hat Inc.
 + *
@@ -30763,7 +30784,9 @@
 +
 +	return 0;
 +fail:
++	mutex_lock(&dev->struct_mutex);
 +	drm_gem_object_unreference(obj);
++	mutex_unlock(&dev->struct_mutex);
 +
 +	return ret;
 +}
@@ -31767,7 +31790,7 @@
 +	return 0;
 +}
 +
-+static void radeon_gem_ib_free(struct drm_radeon_cs_parser *parser)
++static void radeon_gem_ib_free(struct drm_radeon_cs_parser *parser, int error)
 +{
 +	struct drm_device *dev = parser->dev;
 +	drm_radeon_private_t *dev_priv = dev->dev_private;
@@ -31777,18 +31800,27 @@
 +
 +	for (i = 0; i < RADEON_NUM_IB; i++) {
 +		if (dev_priv->ib_objs[i]->kmap.virtual == parser->ib) {
-+			/* emit a fence object */
-+			ret = drm_fence_buffer_objects(dev, NULL, 0, NULL, &fence);
-+			dev_priv->irq_emitted = 0;
-+			if (ret) {
++
++			if (error) {
 +				drm_putback_buffer_objects(dev);
++				dev_priv->ib_alloc_bitmap &= ~(1 << i);
++				parser->ib = NULL;
++				parser->card_offset = 0;
++				break;
++			} else {
++				/* emit a fence object */
++				ret = drm_fence_buffer_objects(dev, NULL, 0, NULL, &fence);
++				dev_priv->irq_emitted = 0;
++				if (ret) {
++					drm_putback_buffer_objects(dev);
++				}
++				/* dereference the fence object */
++				if (fence)
++					drm_fence_usage_deref_unlocked(&fence);
++				break;
 +			}
-+			/* dereference the fence object */
-+			if (fence)
-+				drm_fence_usage_deref_unlocked(&fence);
 +		}
 +	}
-+
 +}
 +
 +static int radeon_gem_ib_destroy(struct drm_device *dev)
@@ -31812,10 +31844,9 @@
 +
 +static int radeon_gem_find_reloc(struct drm_radeon_cs_parser *parser,
 +				 uint32_t offset, uint32_t *handle,
-+				 uint32_t *read_domains, uint32_t *write_domain)
++				 uint32_t *retval)
 +{
 +	struct drm_device *dev = parser->dev;
-+	drm_radeon_private_t *dev_priv = dev->dev_private;
 +	struct drm_radeon_kernel_chunk *reloc_chunk = &parser->chunks[parser->reloc_index];
 +
 +	if (!reloc_chunk->kdata)
@@ -31825,10 +31856,36 @@
 +		DRM_ERROR("Offset larger than chunk %d %d\n", offset, reloc_chunk->length_dw);
 +		return -EINVAL;
 +	}
-+
++      
 +	*handle = reloc_chunk->kdata[offset];
-+	*read_domains = reloc_chunk->kdata[offset + 1];
-+	*write_domain = reloc_chunk->kdata[offset + 2];
++	*retval = reloc_chunk->kdata[offset + 3];
++	return 0;
++}
++
++static int radeon_gem_do_relocate(struct drm_gem_object *obj, uint32_t read_domains,
++				  uint32_t write_domain, uint32_t *offset)
++{
++	struct drm_device *dev = obj->dev;
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	struct drm_radeon_gem_object *obj_priv;
++	uint32_t flags;
++	int ret;
++
++	obj_priv = obj->driver_private;
++	ret = radeon_gem_set_domain(obj, read_domains, write_domain, &flags, false);
++	if (ret)
++		return ret;
++
++	obj_priv->bo->mem.flags &= ~DRM_BO_FLAG_CLEAN;
++	obj_priv->bo->mem.proposed_flags &= ~DRM_BO_FLAG_CLEAN;
++
++	if (offset) {
++		if (flags == DRM_BO_FLAG_MEM_VRAM)
++			*offset = obj_priv->bo->offset + dev_priv->fb_location;
++		else if (flags == DRM_BO_FLAG_MEM_TT)
++			*offset = obj_priv->bo->offset + dev_priv->gart_vm_start;
++	}
++
 +	return 0;
 +}
 +
@@ -31841,7 +31898,7 @@
 +	uint32_t read_domains, write_domain;
 +	struct drm_gem_object *obj;
 +	int flags = 0;
-+	int ret;
++	int ret = 0;
 +	struct drm_radeon_gem_object *obj_priv;
 +
 +	if (parser->reloc_index == -1) {
@@ -31850,35 +31907,63 @@
 +			return -EINVAL;
 +		read_domains = reloc[2];
 +		write_domain = reloc[3];
++
++		ret = radeon_gem_do_relocate(obj, read_domains, write_domain, offset);
++
++		mutex_lock(&dev->struct_mutex);
++		drm_gem_object_unreference(obj);
++		mutex_unlock(&dev->struct_mutex);
++
 +	} else {
 +		uint32_t handle;
-+
 +		/* have to lookup handle in other chunk */
-+		ret = radeon_gem_find_reloc(parser, reloc[1], &handle, &read_domains, &write_domain);
-+		if (ret < 0)
-+			return ret;
-+
-+		obj = drm_gem_object_lookup(dev, parser->file_priv, handle);
-+		if (!obj)
-+			return -EINVAL;
++		ret = radeon_gem_find_reloc(parser, reloc[1], &handle, offset);
 +	}
++	return ret;
++}
 +
-+	obj_priv = obj->driver_private;
-+	radeon_gem_set_domain(obj, read_domains, write_domain, &flags, false);
 +
-+	obj_priv->bo->mem.flags &= ~DRM_BO_FLAG_CLEAN;
-+	obj_priv->bo->mem.proposed_flags &= ~DRM_BO_FLAG_CLEAN;
++int radeon_gem_prelocate(struct drm_radeon_cs_parser *parser)
++{
++	struct drm_device *dev = parser->dev;
++	drm_radeon_private_t *dev_priv = dev->dev_private;
++	struct drm_radeon_kernel_chunk *reloc_chunk = &parser->chunks[parser->reloc_index];
++	struct drm_gem_object *obj;
++	int pass_id;
++	int i;
++	int ret;
++	if (!reloc_chunk->kdata)
++		return -EINVAL;
 +
-+	if (flags == DRM_BO_FLAG_MEM_VRAM)
-+		*offset = obj_priv->bo->offset + dev_priv->fb_location;
-+	else if (flags == DRM_BO_FLAG_MEM_TT)
-+		*offset = obj_priv->bo->offset + dev_priv->gart_vm_start;
++	for (pass_id = 0; pass_id < 2; pass_id++) {
++		/* traverse the reloc chunk */
++		for (i = 0; i < reloc_chunk->length_dw; i += 4) {
++		
++			if (pass_id == 0)
++				reloc_chunk->kdata[i + 3] = 0;
 +
-+	/* BAD BAD BAD - LINKED LIST THE OBJS and UNREF ONCE IB is SUBMITTED */
-+	drm_gem_object_unreference(obj);
++			if (pass_id == 1 && reloc_chunk->kdata[i + 3])
++				continue;
++
++			/* first pass get all write domains */
++			if (((pass_id == 0) && reloc_chunk->kdata[i + 2]) ||
++			    ((pass_id == 1) && reloc_chunk->kdata[i + 1])) {
++				obj = drm_gem_object_lookup(dev, parser->file_priv, reloc_chunk->kdata[i]);
++				if (!obj)
++					return -EINVAL;
++				ret = radeon_gem_do_relocate(obj, reloc_chunk->kdata[i + 1], reloc_chunk->kdata[i + 2],
++							  &reloc_chunk->kdata[i + 3]);
++				mutex_lock(&dev->struct_mutex);
++				drm_gem_object_unreference(obj);
++				mutex_unlock(&dev->struct_mutex);
++				if (ret)
++					return ret;
++			}
++		}
++	}
 +	return 0;
 +}
-+
++ 
 +/* allocate 1MB of 64k IBs the the kernel can keep mapped */
 +static int radeon_gem_ib_init(struct drm_device *dev)
 +{


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1146
retrieving revision 1.1147
diff -u -r1.1146 -r1.1147
--- kernel.spec	14 Nov 2008 01:12:05 -0000	1.1146
+++ kernel.spec	14 Nov 2008 06:06:36 -0000	1.1147
@@ -1921,6 +1921,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Nov 14 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-111
+- radeon - fix low memory issues and locking oops causer
+
 * Thu Nov 13 2008 Dave Jones <davej at redhat.com> 2.6.27.5-110
 - Revert previous change.

More information about the scm-commits mailing list