rpms/kernel/F-10 drm-modesetting-radeon.patch, 1.54, 1.55 drm-next.patch, 1.4, 1.5 kernel.spec, 1.1136, 1.1137
Dave Airlie
airlied at fedoraproject.org
Wed Nov 12 05:07:20 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27221
Modified Files:
drm-modesetting-radeon.patch drm-next.patch kernel.spec
Log Message:
- drm/intel: further interrupt fixes
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.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- drm-modesetting-radeon.patch 11 Nov 2008 23:02:35 -0000 1.54
+++ drm-modesetting-radeon.patch 12 Nov 2008 05:07:18 -0000 1.55
@@ -1,46 +1,46 @@
-commit e261a38b6b15313472342ad38cf3eadbd67314f3
+commit d6568c59bd20f95e9ade0c28018ed0063fda240f
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 09:01:14 2008 +1000
radeon: fix more build
-commit a87d5050fab6cfb136ef986cc9800daaee141e1e
+commit 3f90df7abcb0c88dca52b7287f7675f26d8fa34b
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 08:59:04 2008 +1000
radeon: fix compile
-commit 1f5619f3b1f9619fecb4091348bfefc1d398e2bb
+commit fe3e14dd8da2fd7f4566b32e1e42349089dd9966
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 08:58:55 2008 +1000
i915: fix master bits
-commit cc1c0d62e450d2feacc623f6a7139e2b5b5d89f7
+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 5eca89b16428e877503ca67708a0d2433105bdd2
+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 68169477672050b347d16129538bd2ef223479a4
+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 b7ea8282642be1d565c007647ba382d2e4115ec8
+commit 2894f0654cbae1f21924978d7616263d372b974e
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 9 10:23:43 2008 +1000
radeon: upgrade atom headers
-commit a1f147c3acc4bd5de0537bfcbb42d84e577b8c77
+commit 5e5d4afda733b61984b81c34ca99488b69d80d89
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Nov 8 14:39:41 2008 +1000
@@ -49,13 +49,13 @@
For some reason reading the SCRATCH reg from RAM causes some race to occur.
Hopefully fix this.
-commit a22cc3cbab638add987980e42ab5ebdb3bacfc83
+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 ddb68afe2ffa114bdac52da4bc942e81b2622f69
+commit 7301aabea9a13ff5fa92c97127581d78e656bb09
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 7 16:22:22 2008 +1000
@@ -63,13 +63,13 @@
fixes cursor on second head
-commit 851d6c698307fef111791783f269402b925d764c
+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 6917bd555eb176c4f85b7a11ba517d1a914c28b4
+commit 2bf8bd4aa80b64dfe2b0a491b8376ed24354ff5f
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 5 10:23:35 2008 +1000
@@ -77,19 +77,19 @@
This allows re-use of uc/wc marked pages
-commit d9235ec2433fb4d5dcba94a424a54f61b4134618
+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 ad4678ca88816a723452958576d57ab6073c71a4
+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 32b0a4ab81a5e2e7798c53d1b026f090cc4ddfc6
+commit 63527c82f569bf726666716f674f034d826c2e0e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Nov 4 12:02:55 2008 +1000
@@ -97,25 +97,25 @@
Also set the fetch size to what tcore/fglrx uses.
-commit 27dfc6125f0e44591d0981310affec9e3950a6db
+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 56a47f41c9b58b8945b463ad7d55cfb5ce8584c5
+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 0c8e4f16027068ecd20e940fdc6cb94f50ed24c7
+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 96532c7410a38475bda105f7f837e9d5b8064799
+commit 459586927351eb9d8ab93b1ab2b8215b1de3ec43
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 14:00:39 2008 +1000
@@ -123,49 +123,49 @@
This speeds things up a bit
-commit 91334bf10d3beffd1b3c6ff4f3e5faf250809cfc
+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 4e177449be6b4e11f77044a58af45cff066a3717
+commit 184f8908eec6ac94affcee38fb6b66e8da61b122
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:45:47 2008 +1000
radeon: disable debugging message
-commit 81c8f25381856ff7db4fd9db1722e73d743d8a18
+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 1dc2ca1b6de7384e34ee2bd4719a3f093377e9d9
+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 a99189b71971da596160e723fdb18e57826b243d
+commit 23d61ca8874a750c3aedb606fa98d28af57c8043
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 17:39:08 2008 +1100
radeon: add more HDMI bits
-commit dd61a1a7148ee29e8328baf1e38862527c0e251c
+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 38dd54198b8d8d404d76b4962ddbf56cb93df838
+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 ca65de93a2c0e3927d3952f8eb6bba75b2e6f3d5
+commit aac4405547edf7788d005ffce1f8f6a4efcd0588
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:46:16 2008 +1100
@@ -173,19 +173,19 @@
This allows the rs690 to work on DVI
-commit 9575f0cd9403fb22719b2dc14c75493717eb0ef6
+commit 3cdd3ba5b40548183a91852819119dbc2bc7cb21
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:33:13 2008 +1000
radeon: setup isync cntl properly
-commit 55cbbd38eb967a6e60af306c81ee7dfcaea969bd
+commit 9483186878d00768eff04a3e8eea8c09b646c2df
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:31:27 2008 +1000
radeon: add more debugging
-commit 1158b8a04fc287717cc20fec95e4ebe1140b84d5
+commit c055c200958b019835cc727e03fa50f302404099
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:26:04 2008 +1000
@@ -193,97 +193,97 @@
emit in 16-dword blocks, emit irqs at same time as everything else
-commit a5ec8a8dca0c3b1a94c699929104806de3d99e77
+commit 9428108fcd8f96a5a8a09bddf9c21eabd43e3f72
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:49:09 2008 +1000
radeon: fix race in sysfs
-commit 7d7de62e9586963d9ca1433cce09550b714ba839
+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 b903b70e8ef96c34a25f9173928c1b9643496932
+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 98d35882f6fc0afc710ca47e6cf8562e6c83d506
+commit 8346c15aa0bb6e47251708752451685966b8a39f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 06:35:10 2008 +1000
radeon: add wait rendering API
-commit c84743ad3666a98202fc3d447ae970da14519379
+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 0f39925f8f91a6164dd7900fba513902d193c63f
+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 c617409772d4c06a7ae64994a3741810fb65686d
+commit 6f97124a02c3626cb61ef2f1b78cd176f5416414
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:41:09 2008 +1000
radeon: fix some warnings
-commit 0df5c77b0c1a6b19e2efa84b7e1cbbf3944f4545
+commit 03c6df6aee0ec3dd74792095c3a76ba9c8d4c202
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:40:34 2008 +1000
radeon: fix free after refcount
-commit e9d3d65a2d1bcf4bbf5f82a132b87a9278d3b306
+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 3b4d2f51de358fe794eb2275e6764253cb77c56a
+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 1763cb0db068d8b9e919323a47e1e7ab422f83ac
+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 14a35d4c96ca3f7385888cc703bfabf6d69c14c8
+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 d1f873d5065bfa0c045f0daea485b2894e4260b2
+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 9e5f5d628b1836aa7d24caa37f1fe2f7c92b1a82
+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 f96018ed1c070d6fad6ee7206377b562144440e8
+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 2c06aaf7ea80d1a26a5ac3cdb5fb297be03d4073
+commit 52331868a40273625ab2ae31e6780d2d44baa5ea
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 14:44:23 2008 +1000
@@ -292,67 +292,67 @@
We actually were passing accessible to userspace, but I thought
the code sized it correctly, however it doesn't seem to.
-commit 9e7f7427216c1608528a920d1a3aad126b0a6b3d
+commit 94692d71aa8c6ecc26910437c3edc42d24c6cb7e
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 13:41:05 2008 +1000
radeon: update proper chip family
-commit 1c9874a9db91afb531136d122923d7e8bd1486c7
+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 2da32e369e8654854e1bc8983d589f0295d18438
+commit 52a8a5890d9779b5d43e50a173843341e5b0a73d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 10:27:50 2008 +1000
radeon: make writeback work again
-commit f4fdf7eb126c5cca8291c6e2222158e98cab5364
+commit d3e6a1ccdf8190cc8bac85315b71d8a3ea237bc7
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 09:20:23 2008 +1000
drm: cleanup some warnings
-commit cfac6b775f7994331868506d0d1a14c176f4b1b2
+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 41815084f3f7cc02689209389258d78a2b119dfb
+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 2d6d404b876496aa5418a46dcd4176a4d22c59fd
+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 f5841443cd047eebdb10664dbffd5023ab46fd20
+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 376cd199179bf360458cf6fab6167c80557ddcaa
+commit ef367e4bb45565cb9326dfdb4497027ee5357cf4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 22:06:00 2008 +1000
radeon: fix unused agp functionality
-commit c5b631d101d10768b15c4125c304d4bb0306f996
+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 737e5b9e17c53bb6c66be610c5e4cd7e55138e5e
+commit 5f01ff6b1905275e60e757a98ff4df658cc25116
Author: airlied <airlied at redhat.com>
Date: Wed Oct 15 23:58:03 2008 +1000
@@ -360,55 +360,55 @@
This add agpmode command line option.
-commit 07be9e0a8d1260a48b1bad00b70df03ad31029c9
+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 5d94169ce3bb436a0095b3fd9a23c7d8712615db
+commit 7a971567e26b556c5ece67bf87e1a20a271a12a4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 9 16:37:23 2008 +1100
radeon: fixup interrupt suspend/resume
-commit 43c278f8d90c5d496040d9f25a91b16d3dd437ea
+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 e3870d9f170f94663c0c85c34a3c4ec7207a6c85
+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 5b5f8dd51ce27821a7cb2ed6fb3035148404358f
+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 3c95d10e04d2a4e088b45e235b5290800d1d8ecd
+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 d19d3dca1b3c74c9c43585ef424bd70c208a9fb7
+commit 442d6610f1b7403c47f21842aa20a0e372177e8d
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:34:12 2008 +1000
drm: remove stray debug code
-commit 54af6f6a4375d48acddc032af40ff86cf543c197
+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 a31920fab4fe2e154ee8f085e0c0505dc84e82ba
+commit 2aa4676d07f3b3cf31f8e1a20f190ecb339a4aa0
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:30:09 2008 +1000
@@ -417,7 +417,7 @@
This discards memory contents on suspend/resume with the
hope the upper layers know something we don't.
-commit 1465fc61347ed9e8a009a12403f4077419232154
+commit 27e42a2eb37ea747e62d05fc0cec7fb9c3bd9d12
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:27:31 2008 +1000
@@ -426,7 +426,7 @@
This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
-commit fd4c3635d31172b00053187667ebbdbc7b0d09f2
+commit da3fa2aa492458cb567f033b02fec4ab988423bf
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 6 16:20:38 2008 +1000
@@ -434,31 +434,31 @@
fixup the interface between gem and ttm for alignment. makes Xv work better
-commit 9fd1509a7e8180c679c27696625c3bf55e1f3682
+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 492b17adfc9cebf4c0ee6a0e7c469886b92b3ef9
+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 b2e612abaebe719b58e3f801b7ba9ee403e2b766
+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 cb87ab2b40baefa0e9a9edc532c1a6289bd3def1
+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 288e4778738fa4643b20008240ff654835c44db2
+commit e16eefcb213996211c64b9997fb3727d636e6f67
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:56:32 2008 +1000
@@ -467,43 +467,43 @@
default is legacy modesetting. pass module option r4xx_atom
to try using atom on r4xx.
-commit b69aa812be6713fae2163ed5b0967ccfe1f92328
+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 40b568e57d2eb43a9f3ca662a14cc965f1cbe5e3
+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 afb3a09cb88cce77791c46eec771779e085cec7c
+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 7a2a267f0e040574a9f0327ff4c7320c6b1018a7
+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 010400deb5d868ec8e2f4bbae4a70d85cc4b1d0b
+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 ac7485130983c702f33d979b917936ea0652b993
+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 f363a8feaf61158184ac99f259d2dbd5cf942574
+commit 697a69fe67dd67fefcbb47b745ddadf67ed7e352
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 12:00:57 2008 -0400
@@ -512,31 +512,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 dffb8ad6de810f207df6b8f75b720c948e1fc137
+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 b24f41ffa80da89f24797063d3387f7846791d0e
+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 1eb060796d0b4ddbb6976b17b10120fa67a6a9ad
+commit d900c30be3a23efa608d4aeb8fe3273b18634b16
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 01:55:27 2008 +1000
radeon: fix combios
-commit 9e819895b578376f7f99e556bcf2d4a8233ad699
+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 a6c2cf124b94a4362d67551018167b7cae9cd217
+commit 4fb4c9243ccad7c1d8cafe641a752dc93a65cfca
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:10:29 2008 -0400
@@ -545,7 +545,7 @@
Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
-commit cdd5b373ad3bc0334d6ff87d58968f411e1f2239
+commit 1d0d4dfea459233a68672287bf6df219d9caae0f
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:07:50 2008 -0400
@@ -554,25 +554,25 @@
The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
-commit 153f6dfe91221437baf31fcc4420607bc5405cb4
+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 69aa5e83fef3782ad48ed1dc3c958babb2403e0f
+commit 559bc855adbd7e2de8ca0f7883304925b036c8ca
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:55:14 2008 +1000
radeon: further LVDS fixes
-commit d5126b7cf12f0562ca804ccddcf82f3709d8086e
+commit ccbc88ef2776bf4f440fd02ed5792204a65b9500
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:54:12 2008 +1000
radeon: legacy lvds updates
-commit 509887731c3950a486288d19d9fee3cb40426836
+commit 926ff3aaf29f3c8429dd7c7ca66732af1788d383
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:26:27 2008 +1000
@@ -580,7 +580,7 @@
just fallback around busted stuff for now
-commit 67f07b1593fcfb2d588a9d3a9e3a8ac82b68fe3e
+commit 2d3b0a31653310c57ceaf431601885cd3182369f
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:25:18 2008 +1000
@@ -588,13 +588,13 @@
also dirty buffer on validate
-commit 9cb1868dad3c79c25fe7ad24e9191e440d1ca6f7
+commit aefdba67e5d95a57d4bb6583964663626ed36ac4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 17:13:32 2008 +1000
radeon: disable blit moves
-commit a175ca955236c39f61c6a5c62e716542b1c88688
+commit cbe859c2f80618cb4f2110b96bd476bd82519edf
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 16:18:27 2008 +1000
@@ -602,73 +602,73 @@
Normally this will be due to an AGP driver needing updating
-commit a833e206cc0a8245e36b9bc35d1ccb892f136651
+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 9577372b140ef8cdfa3813c70c2e2076f9832e65
+commit 28f4711d196256422914ea4e0cbec17d969ee40f
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:08 2008 +1000
radeon: fix return value
-commit 97d7962246a7b13c5940f9199c21231b38cdbf17
+commit 785f962b8b6096324eae5d918c9ba7794ef99e69
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:34:39 2008 +1000
radeon: fixup reference counting properly
-commit f0d9d3d72dcdd5b88807e009a4a34adf6b034811
+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 49b17be73755c82c936f82f8afe7bb3e27fbffd2
+commit cddc62790ba7f48aabea09fda4781a2be1d194b0
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 11:37:26 2008 +1000
radeon: remove unneeded debugging
-commit 7f3dc24353c7765a06821315b163b0c8cde30fbe
+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 7eb84ca50034ea155b35aab4e3b84dc24629b2f9
+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 f854e9f811fce2d042ae627999dacc96c7345d09
+commit 7c196b8163a071f6d36c07af22998b09ca904d48
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:20:44 2008 +1000
radeon: make text reserve 256k
-commit 4d1f14b0e030b2aff5995518798d87ff7f76f9de
+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 878489ad2b6a9833bc2ab22b315b464e187c7f37
+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 30d71b3dd6278c599f7c93a64b91fd90abbcb80a
+commit f90df56a797a12ee2aad20fbf2aa0e8cefb2398e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 16:12:59 2008 +1000
radeon: further suspend/resume support
-commit e3f3d1af0fdf56f92f41805c9e9a2efa92e44f85
+commit de93412674cdcb59fcb8ed028b7f3c463d53376e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 14:52:15 2008 +1000
@@ -676,19 +676,19 @@
this gets us back to fbcon.. its dirty like zebra
-commit 4bac6156537655735e23eaf8d501af7ccf9bc89b
+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 e8f964f279c5790023260bcbef4df44bba2686b5
+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 096d3c226397412f267ed2cb38eba19ad5a0d977
+commit 29d1e9a24a00034e81fcf421cd586c67e28f5664
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 10:46:17 2008 +1000
@@ -696,13 +696,13 @@
Allocate the rs480/690 tables from uncached memory.
-commit b0be95b759f27b287977b80a3d7b06e9046ccdd2
+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 2f17af6fe55a51c921ab925d81c7251620690348
+commit 39a6c7fc4051b538f9915f1ec9a9f724efa20c48
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 09:59:02 2008 +1000
@@ -710,7 +710,7 @@
also change name from text to nomodeset
-commit 578f63c32cfd75061d07be723c0a7445216d78bb
+commit 5c8cfcca48053a34f95b49dc762a2cd08148711f
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -718,13 +718,13 @@
also don't explode on lack of DDC
-commit 57a5cced666fd5be2ea3d6564e497770238729b1
+commit 649675ebb5f6654587d73a23a8eae78b5ef07370
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 18:31:50 2008 +1000
drm: fix dev->master convert
-commit 73cbbc48f746c5322587503909ef7f73b53fd494
+commit f737d146f1f3287d485d970e6f217de6a3f7ebd9
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:26:11 2008 -0400
@@ -734,7 +734,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 4143ebeaaf2983b646aa21d2f62133ec119b68a8
+commit e2c4fd1dedc4e0365c07eb88ef5225d2be9b1746
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:24:13 2008 -0400
@@ -746,7 +746,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 1183c7e328c778d9a43ab3f8271f396a0e6c5178
+commit d9b3206c40969ab2f07f8059413aaebf268e441d
Author: Kristian Høgsberg <krh at redhat.com>
Date: Tue Aug 12 22:39:54 2008 -0400
@@ -759,13 +759,13 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit d321bef3c87914b3e29ea95c808ae2f6db8eb597
+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 e6d14dd27ef916d0539fe711f672f497417c9cd6
+commit fed02f7782eabc3e92c0601cc81e7e99218330c9
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:34 2008 +1000
@@ -773,43 +773,43 @@
This should do a better job at picking the initial configuration crtcs
-commit 02cd3c0ef1c2d643ae2ca5d066c62237b607c7b1
+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 4ef8ea1126cdf8ca8ff4291dcbb96c6692cb1e70
+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 5fd6d74539a2101167029d507c49d68d39dd1fbc
+commit c31ee74ed9fc3b98ce42241677c8ce0e154b7797
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 15:39:17 2008 +1000
radeon: fix after rebase
-commit 2738153c75f627d18ef637d5a30d534fc4730882
+commit c3d58fc173ec5498834805057ac974bfa2393ec6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 13:43:23 2008 +1000
drm: fix whitespace
-commit 7917c14207f6273534a601d3b71275f6d6278124
+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 70f5ac40682986c4799d4d2f54303beaf479a4b8
+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 4f1096f3deeddd31c65a9910d99ced97201cadf2
+commit 281509f0606fba332926bf209ffd5c2b3918906e
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:37 2008 +1000
@@ -818,7 +818,7 @@
- done: primary dac, vga on tvdac
- todo: ext dac, tv on tvdac
-commit 856c7f540daa9689d20d98fdef0899bcad6e00d2
+commit 06373e8128ef61ebf6a9c2d6fc931969042edd81
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:11 2008 +1000
@@ -826,25 +826,25 @@
- todo: updated connected status
-commit 62d573a32ed806604d1259493b4376a52cd4e488
+commit 7878013542931529e9d85266d38e5f7ce3a9b0ef
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:54 2008 +1000
radeon: remove unused legacy state
-commit 3a741b48f58b091dd0090bab3f8e116d71b26655
+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 05ba25125b62a9b9414cff972180f11e709c7ee8
+commit 6d09134f8e0c13439d48ba914e83024df95dd732
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:03:13 2008 +1000
x86: export pat_enabled
-commit 7fb537aa5d6a1786de8d10bad818abbd6b833f68
+commit c10a45a6acc6420ca682a017d19f756f862c38d7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:02:43 2008 +1000
@@ -853,7 +853,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 bee82f1ad5e654bebea568ab3bedc8c533deb912
+commit fe9106c6b5e7709338c98325f974b0248229ab6f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:01:35 2008 +1000
@@ -862,7 +862,7 @@
move domain validate function to separate function
call it from correct places
-commit 6d30df256f58154b75f2d018a137313a56a7a5dd
+commit 18a6de6280aba92c84f6d5e04d8e21ace5ac1262
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:00:49 2008 +1000
@@ -871,37 +871,37 @@
If a BO hasn't been dirtied, do a solid fill on VRAM instead of
migrating pages to VRAM
-commit 9466b12ac60e6eb8bf3cbe300b25e777f3ecdbfb
+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 2b512a70f4e1643bfb71e325d9e8322255f8b814
+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 dc334067d587bfd889ef19f771de859413e8e458
+commit 8f3e51e58bcb6537e0c82aaf4d560aabead399dc
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:01 2008 +1000
radeon_gem: fix some misplace ==
-commit 2d13483688d2a5c02aa0c6955791dd8dfd1d7445
+commit f174e11fed8c56a1c99c616d2e26af3cdde50daf
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:13:25 2008 +1000
radeon: get buffer upload working
-commit 61c4758f3343f66bdcf77805738bcc861b11c442
+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 f6e94b5d0668e0beda9f3384e8d1e487c6970047
+commit 7f0e2ccc44d2408e8319f4c0d641be1905359dae
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:11:55 2008 +1000
@@ -910,7 +910,7 @@
We need a buffer zeroing function for before we have
accel running etc
-commit 50e0784efffae50425399d6b7f8003a395e10af0
+commit 1ed6c585d5c74e001efbe62c31a8e0b17642ed1d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:49:16 2008 +1000
@@ -921,49 +921,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 25097435a7fe54248d744d63f6405fb30dc14f77
+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 d74c2e65025078a13b432697edf5233f3c874063
+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 4d5949a02a7c4dd34d5d2ea6696897978ed7226d
+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 fa00392052f08a48c9bba2fc102d6feb406fa665
+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 8fa4dd2051e602bb777e60a074041ed93470a977
+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 897acbaeaf9593298365fa0f59218f0ded9a97f7
+commit 89a66b690dd4d452de8b0674342c57367188ccda
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:14:38 2008 +1000
radeon: add GTT domain
-commit e2804d1a75496f744311f515064fdc42dced1c84
+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 b48bee5f1c85785e7cabb6eb229ee673543f4452
+commit 08ccc35ff5b76149c1ed1a9f45e66d6356241f7e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 14:28:43 2008 +1000
@@ -975,37 +975,37 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 3ed6a692bd8f4da18e664079556bc9a40b76ca49
+commit de5609a2352cdadc17b6169fec3af1543eff1ba9
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:14:56 2008 +1000
disable modeset on < r300
-commit 4630042e75176aa1abeb5146588bdd4227713bee
+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 bebc5df6b19ab4cd7de965ce5e9ba1db6bc36fed
+commit 9b8d4c26b67bbcb923402b3a793c794aadfa4695
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:35:55 2008 +1000
radeon: fix LVDS modes problem
-commit 2eadb07983dfb1bed0176e49c32841c2dd98b243
+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 c1890dfd45fe3c4bf6f4ee652e96aa8af3c0414c
+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 736c1cbccc5ed4d301b69dbd00cc48f985d06300
+commit 0db218dc113a1e163c9c1e076b85c2872edf127a
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 15:23:51 2008 +1000
@@ -1013,7 +1013,7 @@
Need to add to Intel when we get there
-commit c5a234feae022bd703b6bce6208c1071508b4552
+commit 34daa88f3c7fdb02466e080b780c9e7bd662d31d
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:38:27 2008 +1000
@@ -1021,31 +1021,31 @@
This gets RN50 to initialise correctly
-commit 7c6c4d20f8d027a017bdf5f8ca013d632576d8f4
+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 844c4e46541962bdc5f919dfbb31ed4972ae9285
+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 14a183de435c5ac5cb0fd1211cdd9e6f5517fc1e
+commit 76f0e4e10e193e57632d4b7cde428ddc4f59b47e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 09:59:31 2008 +1000
radeon: add quirks from DDX
-commit ffd61f4f869d40122e83faa0cb73a390f62b37ca
+commit 179163f593237ef65e695bf21982fa708f31c8fc
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:12 2008 +1000
radeon: fix warnings
-commit 24ef535195ade64eaa30d9b56b43d5cf5e81f4a6
+commit d0dd7fd730fd88f64124931ef25abf5e05a1c72e
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:47 2008 +1000
@@ -1056,31 +1056,31 @@
- add debugging for tracing calls
- fix pitch calculation
-commit 9800d1c57c5487174e6ab39775ca02627fc49ce0
+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 13f769ea6fb5fdeda2b100b6462405abe48d816b
+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 03b9b0c9b0ccc4b8bb2483b6030cf80ca96a88e3
+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 8932e99a6cc1cb71a5f71e429f57106e09a21f8d
+commit b8fa51978f9de79e2f77581568b07f6f92d10288
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:53:08 2008 +1000
radeon/atom: implement crtc lock
-commit 7528a5f8f45052ff96040716fb77f416439a81d7
+commit 31ca3d0795c75aff1452fae4973297410e6f18b8
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:50:15 2008 +1000
@@ -1089,7 +1089,7 @@
- Add gamma set for legacy chips
- Add 16 bpp gamma set
-commit 344c168f4640af27168529442d50c3abce1052ba
+commit a85d02155f6b3d3b802309e1d1386503c333a8d0
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:55 2008 +1000
@@ -1099,19 +1099,19 @@
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
-commit 726a1e78f682257baf1c0fc6e18453a816cff6f1
+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 ca64a154ada1d3ff15a78b4f9f98f49009f35a13
+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 08f4884f22844e65e89acafa32096ea0184ff917
+commit 9d4a6923b0000d9656a6bc6b6724d9cb8b9ac145
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:48:50 2008 +1000
@@ -1119,25 +1119,25 @@
- removed save/init/restore chain with set functions
-commit 61b20ac44ea784dc3175257ab8521913cfbd1fd4
+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 987e0a3df981e1e928bbcba0d5c2ae6ba5a7e092
+commit 013cd174dba96a6de4d84220a79fabc0ecc9c9bf
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:52:41 2008 +1000
radeon: command submission remove debug
-commit 0e47606572c1317c1c12c20cfc9d9a8a3fc6aaff
+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 e216551bafada9c85137806d3a656040c75d6d55
+commit 2204fd39722bcd7ef03fd8d98b173a3cbbea9793
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:19:05 2008 +1000
@@ -1145,19 +1145,19 @@
in the correct place in the drm so buffer swaps work again
-commit 4d4cc6152ad642fd092897ac9411050444ca6aca
+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 c86e99b92c34b73c2c0b84aaadba355135098c95
+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 b445bbdaa96c8485a1f32e16fdd850a2567d0371
+commit 838a375824eebf939c93a420fd6a7af4ac468c6e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 15:57:10 2008 +1000
@@ -1166,7 +1166,7 @@
This adds the CRTC and PLL setting code, it doesn't work
yet but its all heading in the right direction.
-commit 8bbc05deb42fc2c9fa89c93b4126a57d0ecfe832
+commit da5a8c8a6a53e343dd8cfbb87e6f905a23d1608a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 13:32:50 2008 +1000
@@ -1175,67 +1175,67 @@
In theory we should be setting the mapping for the legacy node.
the inode for the control node might be different.
-commit dfa2faf4e519e06e1d5f0f3b5830ad98d2879d10
+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 7c7b6467c2065052740ea7d190c4802eb97e5301
+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 def8f5a1acf1ce25d18cb3f5ad8c067324ff22b0
+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 8d66888e89156bb4e9a6c7bcce2ebfd6740d087a
+commit 071a073fbb2acbe830dd4fa786eb05f0474948f6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:38 2008 +1000
radeon: set gart table size
-commit ed962d1002f92041c3a46970ee85b4e8b8f8e9ba
+commit fcf49c9e160b52f17c724a346542306fe4e87b7a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:18 2008 +1000
radeon: fix buffer evict slection
-commit 7503d2ce9e4ab7d57f4cde5770d09ef6a3d27e0a
+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 cc9d71109898051caf6aaedd53147e9c545ed2b5
+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 0eb787062ffea23be38456ac77fb9de34a8f6028
+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 8cfd7d19af056dbb6f52e04b23e3e13fc33eee9f
+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 f0bb752cd23680125dfe0ba5ae59b5bd02e94dca
+commit ce0809ddf355edc21b3353638cca0066c4c8435f
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:21:22 2008 +1000
drm: fix unneeded debug
-commit 63afef3b5e6a165e715a06e080b5210074f06edc
+commit 8cc9be2d095d1cb3146d5fe932d54a79d024457d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:47 2008 +1000
@@ -1243,49 +1243,49 @@
if kms enabled memory manager will be enabled by default
-commit 1269723b2a494c49aa5179892c7c206a11e335ad
+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 324ef0b770fec3f4e0033b7fe13c36ada30410c3
+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 31118609540c377d7dbdc3ce7907410e4f5ffc37
+commit 632133c986908ebd2c9dedbc033202ed9c94e9c1
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Aug 2 08:06:26 2008 +1000
drm: fix release locking
-commit ad886fbdf4e546f7483f697556eb464d3d01831f
+commit 3e88e208dc58abf1a07706cc1ea843b5c6a9acd0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 23:39:24 2008 +1000
fix build on powerpc
-commit b42d857c722f2143e98c41747f92f77cecb65806
+commit e49aefaf64778eadec602027bd347a5b84014769
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 16:55:34 2008 +1000
drm: add radeon modesetting support
-commit 21805891552de30e5654b9e8ec4cc84d691b7c7f
+commit 7d977999ce46f9b824c16e743b1d3f2497e45005
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:07:35 2008 +1000
drm: add modesetting support
-commit c6b66e5348186fc0db12d6a04174292f8dcecc04
+commit bcb5d1dd38bf9b3ed2e1a55f1311c113c1caf7b9
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:06:12 2008 +1000
drm: add TTM VM changes
-commit 1c5e92bcf2fcfef89c449b0710bab83d3704c2ea
+commit e3ae45bbcd6ddc107ce9dfa47a429922b256e3c6
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:24:36 2008 +1000
@@ -1293,13 +1293,13 @@
This adds the control device nodes also
-commit 070c98b819c227fbc7a3419ee50e15f988135b75
+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 10968412ef232f3d52137fb91a4b98a792ddbc50
+commit 46bd4453d68f6c8651672ca4cd2406983ef15e38
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:57 2008 +1000
@@ -1309,13 +1309,13 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 23237d4e43c762c076be092a972991713d30ffdc
+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 da6cc27cd4e281869c756092481f1c93249c01da
+commit cbcc953b7b574efea10d75c03635e2c808b836ee
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jul 31 15:27:27 2008 +1000
@@ -12734,7 +12734,7 @@
.proc_cleanup = i915_gem_proc_cleanup,
.gem_init_object = i915_gem_init_object,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index 9b5b6dd..2892e10 100644
+index ed1edcf..c829f24 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -101,13 +101,16 @@ struct intel_opregion {
@@ -12879,10 +12879,10 @@
+ master->driver_priv = NULL;
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 9a89667..5359b16 100644
+index 047b9d7..d0bb829 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -162,6 +162,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+@@ -168,6 +168,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
{
struct drm_device *dev = (struct drm_device *) arg;
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -12890,9 +12890,9 @@
u32 iir, new_iir;
u32 pipea_stats = 0, pipeb_stats = 0;
int vblank = 0;
-@@ -196,9 +197,8 @@ msi_interrupt_again:
-
- spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+@@ -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 =
@@ -12902,7 +12902,7 @@
if (iir & I915_USER_INTERRUPT) {
dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
-@@ -237,6 +237,7 @@ msi_interrupt_again:
+@@ -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;
@@ -12910,7 +12910,7 @@
RING_LOCALS;
i915_kernel_lost_context(dev);
-@@ -246,8 +247,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;
@@ -12921,7 +12921,7 @@
BEGIN_LP_RING(4);
OUT_RING(MI_STORE_DWORD_INDEX);
-@@ -285,21 +286,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;
@@ -12948,7 +12948,7 @@
i915_user_irq_get(dev);
DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
-@@ -311,14 +311,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);
}
drm-next.patch:
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- drm-next.patch 12 Nov 2008 00:08:23 -0000 1.4
+++ drm-next.patch 12 Nov 2008 05:07:19 -0000 1.5
@@ -1,4 +1,4 @@
-commit f923fc916fa3aa5c3acf66d3223138227df58fb9
+commit 894540f219ca3d87be7acbe7833d86119b624fa5
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -14,7 +14,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 395e0ddc44005ced5e4fed9bfc2e4bdf63d37627)
-commit 5a9568f2ccf9040fc461aab1628c9b8d6302a628
+commit 7b2a72df0e653c49327dc90651120e848cad6d28
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 11:07:28 2008 +1000
@@ -25,16 +25,15 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 8c37a96d0b5d6551eb8e58e822e120ad5f95e30e
-Author: Eric Anholt <eric at anholt.net>
-Date: Wed Nov 5 12:37:42 2008 -0800
+commit 852f6a210d90848774673a08d03bf85a7b8fffdb
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Nov 12 15:00:33 2008 +1000
i915: Add /proc debugging entry for reading out the HWS.
Signed-off-by: Eric Anholt <eric at anholt.net>
- (cherry picked from commit 9cbe1ed025faeac88323fa697c016fd9a76a1563)
-commit d0006ef2096b5aa8d25dd773dd7c7c7e5b57083c
+commit 147d7004520f5c6a8b77f16614bd1d699909d9b4
Author: Eric Anholt <eric at anholt.net>
Date: Tue Nov 4 15:50:30 2008 -0800
@@ -51,24 +50,23 @@
to handle, and restart if we didn't get IIR all the way to zero.
Signed-off-by: Eric Anholt <eric at anholt.net>
- (cherry picked from commit a9c989845b96e77669839ee47e1b9fd92075b286)
-commit 18e064f8710ff0f9e9f0ce08b888e0295a7d7eb1
+commit 022490db8d14abd18a83b8bb93fdbe2a5ae4e064
Author: Keith Packard <keithp at keithp.com>
Date: Tue Nov 4 02:03:27 2008 -0800
- Manage PIPESTAT pending interrupt values to unblock vblank interrupts
+ i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
The pipestat fields affect reporting of all vblank-related interrupts, so we
have to reset them during the irq_handler, and while enabling vblank
- interrupts.
+ interrupts. Otherwise, if a pipe status field had been set to non-zero
+ before enabling reporting, we would never see an interrupt again.
This patch adds i915_enable_pipestat and i915_disable_pipestat to abstract
out the steps needed to change the reported interrupts.
Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
- (cherry picked from commit 656c057945bf97304667e30c817045c832328506)
commit 72d34483fe6f50c57f984637fcd7e37e1265f202
Author: Keith Packard <keithp at keithp.com>
@@ -4197,7 +4195,7 @@
.fops = {
.owner = THIS_MODULE,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
-index d7326d9..9b5b6dd 100644
+index d7326d9..ed1edcf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -30,6 +30,9 @@
@@ -4306,8 +4304,8 @@
+ spinlock_t user_irq_lock;
+ /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
+ int user_irq_refcount;
-+ /** Cached value of IER to avoid reads in updating the bitfield */
-+ u32 irq_enable_reg;
++ /** Cached value of IMR to avoid reads in updating the bitfield */
++ u32 irq_mask_reg;
+ u32 pipestat[2];
int tex_lru_log_granularity;
@@ -8974,10 +8972,10 @@
+ return 0;
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index df03611..9a89667 100644
+index df03611..047b9d7 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -31,259 +31,204 @@
+@@ -31,259 +31,213 @@
#include "i915_drm.h"
#include "i915_drv.h"
@@ -8987,11 +8985,15 @@
-
#define MAX_NOPID ((u32)~0)
--/**
+ /**
- * Emit blits for scheduled buffer swaps.
-- *
++ * Interrupts that are always left unmasked.
+ *
- * This function will be called with the HW lock held.
-- */
++ * Since pipe events are edge-triggered from the PIPESTAT register to IIR,
++ * we leave them always unmasked in IMR and then control enabling them through
++ * PIPESTAT alone.
+ */
-static void i915_vblank_tasklet(struct drm_device *dev)
-{
- drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -9020,14 +9022,9 @@
- cmd |= XY_SRC_COPY_BLT_SRC_TILED;
- src_pitch >>= 2;
- }
-+/** These are the interrupts used by the driver */
-+#define I915_INTERRUPT_ENABLE_FIX (I915_ASLE_INTERRUPT | \
-+ I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
-+ I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
-
+-
- DRM_DEBUG("\n");
-+#define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT)
-
+-
- INIT_LIST_HEAD(&hits);
-
- nhits = nrects = 0;
@@ -9069,26 +9066,31 @@
- break;
- }
- }
-+#define I915_INTERRUPT_ENABLE_MASK (I915_INTERRUPT_ENABLE_FIX | \
-+ I915_INTERRUPT_ENABLE_VAR)
++#define I915_INTERRUPT_ENABLE_FIX (I915_ASLE_INTERRUPT | \
++ I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
++ I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
- spin_unlock(&dev->drw_lock);
--
++/** Interrupts that we mask and unmask at runtime. */
++#define I915_INTERRUPT_ENABLE_VAR (I915_USER_INTERRUPT)
+
- /* List of hits was empty, or we reached the end of it */
- if (hit == &hits)
- list_add_tail(list, hits.prev);
--
++/** These are all of the interrupts used by the driver */
++#define I915_INTERRUPT_ENABLE_MASK (I915_INTERRUPT_ENABLE_FIX | \
++ I915_INTERRUPT_ENABLE_VAR)
+
- nhits++;
-
- spin_lock(&dev_priv->swaps_lock);
+void
+i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)
+{
-+ mask &= I915_INTERRUPT_ENABLE_VAR;
-+ if ((dev_priv->irq_enable_reg & mask) != mask) {
-+ dev_priv->irq_enable_reg |= mask;
-+ I915_WRITE(IER, dev_priv->irq_enable_reg);
-+ (void) I915_READ(IER);
++ if ((dev_priv->irq_mask_reg & mask) != 0) {
++ dev_priv->irq_mask_reg &= ~mask;
++ I915_WRITE(IMR, dev_priv->irq_mask_reg);
++ (void) I915_READ(IMR);
}
+}
@@ -9098,11 +9100,10 @@
+static inline void
+i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask)
+{
-+ mask &= I915_INTERRUPT_ENABLE_VAR;
-+ if ((dev_priv->irq_enable_reg & mask) != 0) {
-+ dev_priv->irq_enable_reg &= ~mask;
-+ I915_WRITE(IER, dev_priv->irq_enable_reg);
-+ (void) I915_READ(IER);
++ if ((dev_priv->irq_mask_reg & mask) != mask) {
++ dev_priv->irq_mask_reg |= mask;
++ I915_WRITE(IMR, dev_priv->irq_mask_reg);
++ (void) I915_READ(IMR);
}
+}
@@ -9297,16 +9298,13 @@
- pipea_stats = I915_READ(I915REG_PIPEASTAT);
- pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
+ atomic_inc(&dev_priv->irq_received);
-+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
- temp = I915_READ16(I915REG_INT_IDENTITY_R);
+ iir = I915_READ(IIR);
- temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
-+ if (iir == 0) {
-+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
++ if (iir == 0)
+ return IRQ_NONE;
-+ }
- DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
+msi_interrupt_again:
@@ -9314,15 +9312,19 @@
+ * Clear the PIPE(A|B)STAT regs before the IIR
+ */
+ if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
++ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+ pipea_stats = I915_READ(PIPEASTAT);
+ I915_WRITE(PIPEASTAT, pipea_stats);
++ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+ }
- if (temp == 0)
- return IRQ_NONE;
+ if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
++ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+ pipeb_stats = I915_READ(PIPEBSTAT);
+ I915_WRITE(PIPEBSTAT, pipeb_stats);
++ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+ }
- I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
@@ -9332,31 +9334,15 @@
+ new_iir = I915_READ(IIR); /* Flush posted writes */
- dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-
-- if (temp & USER_INT_FLAG)
+ if (dev_priv->sarea_priv)
+ dev_priv->sarea_priv->last_dispatch =
+ READ_BREADCRUMB(dev_priv);
-+
+
+- if (temp & USER_INT_FLAG)
+ if (iir & I915_USER_INTERRUPT) {
+ dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
DRM_WAKEUP(&dev_priv->irq_queue);
+ }
-+
-+ if (pipea_stats & I915_VBLANK_INTERRUPT_STATUS) {
-+ vblank++;
-+ drm_handle_vblank(dev, 0);
-+ }
-+
-+ if (pipeb_stats & I915_VBLANK_INTERRUPT_STATUS) {
-+ vblank++;
-+ drm_handle_vblank(dev, 1);
-+ }
-+
-+ if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
-+ (iir & I915_ASLE_INTERRUPT))
-+ opregion_asle_intr(dev);
- if (temp & (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {
- int vblank_pipe = dev_priv->vblank_pipe;
@@ -9385,20 +9371,38 @@
- I915_WRITE(I915REG_PIPEBSTAT,
- pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
- I915_VBLANK_CLEAR);
++ if (pipea_stats & I915_VBLANK_INTERRUPT_STATUS) {
++ vblank++;
++ drm_handle_vblank(dev, 0);
++ }
++
++ if (pipeb_stats & I915_VBLANK_INTERRUPT_STATUS) {
++ vblank++;
++ drm_handle_vblank(dev, 1);
++ }
++
++ if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
++ (iir & I915_ASLE_INTERRUPT))
++ opregion_asle_intr(dev);
++
+ /* With MSI, interrupts are only generated when iir transitions from
+ * zero to nonzero. If another bit got set while we were handling
+ * the existing iir bits, then we would never get another interrupt.
+ * This is fine on non-MSI as well, as if we hit this path we avoid
+ * exiting the interrupt handler only to generate another one.
++ *
++ * Note that for MSI this could cause a stray interrupt report if an
++ * interrupt landed in the time between writing IIR and the posting
++ * read. This should be rare enough to never trigger the 99% of
++ * 100,000 interrupts test for disabling stray interrupts.
+ */
+ if (new_iir != 0) {
-+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+ iir = new_iir;
+ goto msi_interrupt_again;
}
return IRQ_HANDLED;
-@@ -298,23 +243,45 @@ static int i915_emit_irq(struct drm_device * dev)
+@@ -298,23 +252,45 @@ static int i915_emit_irq(struct drm_device * dev)
DRM_DEBUG("\n");
@@ -9453,7 +9457,7 @@
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;
-@@ -323,55 +290,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -323,55 +299,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
READ_BREADCRUMB(dev_priv));
@@ -9522,7 +9526,7 @@
/* Needs the lock as it touches the ring.
*/
int i915_irq_emit(struct drm_device *dev, void *data,
-@@ -381,14 +327,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,
+@@ -381,14 +336,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,
drm_i915_irq_emit_t *emit = data;
int result;
@@ -9540,7 +9544,7 @@
if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {
DRM_ERROR("copy_to_user\n");
-@@ -414,18 +361,31 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -414,18 +370,38 @@ int i915_irq_wait(struct drm_device *dev, void *data,
return i915_wait_irq(dev, irqwait->irq_seq);
}
@@ -9553,18 +9557,24 @@
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- u16 flag;
+ unsigned long irqflags;
-+
-+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-+ i915_enable_pipestat(dev_priv, pipe, I915_VBLANK_INTERRUPT_ENABLE);
-+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-+ return 0;
-+}
- flag = 0;
- if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A)
- flag |= VSYNC_PIPEA_FLAG;
- if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B)
- flag |= VSYNC_PIPEB_FLAG;
++ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
++ if (IS_I965G(dev))
++ i915_enable_pipestat(dev_priv, pipe,
++ PIPE_START_VBLANK_INTERRUPT_ENABLE);
++ else
++ i915_enable_pipestat(dev_priv, pipe,
++ PIPE_VBLANK_INTERRUPT_ENABLE);
++ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
++ return 0;
++}
+
+- I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);
+/* Called from drm generic code, passed 'crtc' which
+ * we use as a pipe index
+ */
@@ -9572,15 +9582,16 @@
+{
+ drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ unsigned long irqflags;
-
-- I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);
++
+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-+ i915_disable_pipestat(dev_priv, pipe, I915_VBLANK_INTERRUPT_ENABLE);
++ i915_disable_pipestat(dev_priv, pipe,
++ PIPE_VBLANK_INTERRUPT_ENABLE |
++ PIPE_START_VBLANK_INTERRUPT_ENABLE);
+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
}
/* Set the vblank monitor pipe
-@@ -434,22 +394,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -434,22 +410,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -9603,7 +9614,7 @@
return 0;
}
-@@ -458,19 +408,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -458,19 +424,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
{
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_pipe_t *pipe = data;
@@ -9624,7 +9635,7 @@
return 0;
}
-@@ -481,104 +425,21 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -481,104 +441,21 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
int i915_vblank_swap(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
@@ -9744,7 +9755,7 @@
}
/* drm_dma.h hooks
-@@ -587,37 +448,62 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -587,37 +464,65 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -9773,7 +9784,8 @@
+
+ dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
+
-+ dev_priv->irq_enable_reg = I915_INTERRUPT_ENABLE_FIX;
++ /* Unmask the interrupts that we always want on. */
++ dev_priv->irq_mask_reg = ~I915_INTERRUPT_ENABLE_FIX;
- spin_lock_init(&dev_priv->swaps_lock);
- INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
@@ -9787,9 +9799,11 @@
+ /* Disable pipe interrupt enables, clear pending pipe status */
+ I915_WRITE(PIPEASTAT, I915_READ(PIPEASTAT) & 0x8000ffff);
+ I915_WRITE(PIPEBSTAT, I915_READ(PIPEBSTAT) & 0x8000ffff);
++ /* Clear pending interrupt status */
++ I915_WRITE(IIR, I915_READ(IIR));
+
-+ I915_WRITE(IMR, ~I915_INTERRUPT_ENABLE_MASK);
-+ I915_WRITE(IER, dev_priv->irq_enable_reg);
++ I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
++ I915_WRITE(IMR, dev_priv->irq_mask_reg);
+ (void) I915_READ(IER);
+
+ opregion_enable_asle(dev);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1136
retrieving revision 1.1137
diff -u -r1.1136 -r1.1137
--- kernel.spec 12 Nov 2008 00:06:36 -0000 1.1136
+++ kernel.spec 12 Nov 2008 05:07:19 -0000 1.1137
@@ -1911,6 +1911,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-101
+- drm/intel: further interrupt fixes
+
* Tue Nov 11 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-100
- Check for additional ATI chipset timer bugs (#470939, #470723)
More information about the fedora-extras-commits
mailing list