rpms/kernel/devel drm-modesetting-radeon.patch, 1.19, 1.20 kernel.spec, 1.927, 1.928 fixup-dri2-kms-merge.patch, 1.2, NONE
Dave Airlie
airlied at fedoraproject.org
Fri Sep 5 01:28:58 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11315
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Removed Files:
fixup-dri2-kms-merge.patch
Log Message:
* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
- modesetting updates - fix AMD rs690 - roll in krh dri2 patch
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- drm-modesetting-radeon.patch 29 Aug 2008 00:04:46 -0000 1.19
+++ drm-modesetting-radeon.patch 5 Sep 2008 01:28:57 -0000 1.20
@@ -1,4 +1,36 @@
-commit 098dd0e6b64b5ec62988dc2cd2168ab5154899e1
+commit 6d533f4ec5624d7d294f5ce5d698c30d4382b4bd
+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 3b5d57a098300ad79dd2693e4480a83d7fd2298c
+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 ea2736134338c1f004a232107b61a7164a902b95
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Sep 5 10:46:17 2008 +1000
+
+ radeon: rs690 GART tables need to be in uncached memory.
+
+ Allocate the rs480/690 tables from uncached memory.
+
+commit 129fe6b27ae6abf84426978c0fd5b09780504d11
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Sep 4 12:01:06 2008 +1000
+
+ drm: fixup DRI2 merge with kms code
+
+commit 1f9bbda7e991e206d29451d13b6a57e38da96e3d
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Sep 4 11:58:08 2008 +1000
+
+ drm/radeon: fixup some avivo/rs690 checks
+
+commit ff8a10c7422b9ece2c9ac8310565b31b9c13e5fc
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 09:59:02 2008 +1000
@@ -6,7 +38,7 @@
also change name from text to nomodeset
-commit 5aa38d1a3c8fbf239abeb6f73a9a76acc5124d5c
+commit c3bbe9c782d2edcd3524f438532e4297998ae8cc
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -14,13 +46,13 @@
also don't explode on lack of DDC
-commit 96941a75072d7d681c576921cc510c275891976d
+commit 0818f8ce90cdb651c273666bb5667e2cc5c35e13
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 18:31:50 2008 +1000
drm: fix dev->master convert
-commit f3c81bea8d5160589fe21995a2e1077c0ad01afa
+commit 518d3561e50b3277d72b61297b6edf3272827bfd
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:26:11 2008 -0400
@@ -30,7 +62,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 6e88a37e7d7fa99b29e2c5022d1bee97afa2b28b
+commit 4a7d06ccebac463f0880d713a0b8bf80f53cc7a4
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:24:13 2008 -0400
@@ -42,7 +74,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit fe4d7a07faea6fc365fed407d339980464590b71
+commit 488bfc69d766df0853afdfaa5985a554922b5376
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:20:13 2008 -0400
@@ -52,7 +84,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 3825c6b0af8a237fb3a6fe46dff499bddb50a0f2
+commit 431aca479c5a7b7f804a66dedad43ba44fdeea15
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:08:52 2008 -0400
@@ -60,7 +92,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 9a59e8227c2eb23fbf2bcb2737033ef21bb87720
+commit 7553946d48bb9ae64ced6d06f026a93b0c53b5cb
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:04:27 2008 -0400
@@ -68,7 +100,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 0a209ebe78920cfdcd991c2b7b74217579156bb0
+commit 584dbebb70f8230122afbbd5110009162770bf38
Author: Kristian Høgsberg <krh at redhat.com>
Date: Tue Aug 12 22:39:54 2008 -0400
@@ -81,13 +113,13 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 4a06f25afb8df52fa85897a3324b04df89f5a356
+commit 23406dd2f28e170f2c9f7add644609808e75f004
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:49 2008 +1000
radeon: fix LVDS on atombios - typos
-commit 25ad7f2560a6a13441263af31e0de41cca305706
+commit 0e7b660ad45b4674604f20b9c3c5811219e075de
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:34 2008 +1000
@@ -95,43 +127,43 @@
This should do a better job at picking the initial configuration crtcs
-commit 88c27423c813ab2482f8ece587e2c314508f3cc7
+commit 91cf052ae6e97f41c13ed1f7059b48f491b802ab
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 e6e68d08bf4c273c948fec76106b2f7b509cbf30
+commit 2f181c55321e6c24d706d5bb9cc7fc7b625f1ab4
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 f3a375d2c45dd865d736f9df03e157c698339f60
+commit c8a3d5f306b9dfd538f67b8e707bd454e6e53ced
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 15:39:17 2008 +1000
radeon: fix after rebase
-commit a0c7cb6c3198485fb770cd768c8f6d6e1f20b99d
+commit da2237953d7e500d2e6a9fc66bed31ca3b1f2309
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 13:43:23 2008 +1000
drm: fix whitespace
-commit 3caae63652c2e386342123daf34d13a8ad88359d
+commit 3f967e6277b6224ce9ef144636f8bb8e198c4139
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 cb10610337859488b79cc20acebf01c737633a28
+commit 812db8756bc94a232ac59e05cf9b040ec77dc4a5
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 0bb060b65459a7392db7be8569fa5a0172dba2f6
+commit 0bea3d2964f2f05bdadc3e3a71d01a93813e7da4
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:37 2008 +1000
@@ -140,7 +172,7 @@
- done: primary dac, vga on tvdac
- todo: ext dac, tv on tvdac
-commit 53dd6f04236584661fd87acf0086f52b00b08ea9
+commit 790b51602d09d32d9a9b6f493fe62ddf70f83927
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:11 2008 +1000
@@ -148,25 +180,25 @@
- todo: updated connected status
-commit 5725cb7d0ec835f5d1f4399ae15d670523678559
+commit 92bb1ccd4f62967b4659342996767d66f06d1b43
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:54 2008 +1000
radeon: remove unused legacy state
-commit 9ce901bbfb5d8fca863d33728928c12baaff0809
+commit b3e17b7e1fe17f933a2525274c46c96714ad65b5
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 16f177e98bcd5527e88781cee4000ff71943b509
+commit fcca48fd45005f97d93ecdb463c25861c7f7c64a
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:03:13 2008 +1000
x86: export pat_enabled
-commit 5e04fb54aa301877d55c9253faf5c970c3728e48
+commit ad980a21487d319e65a9cb97037a8b4becd7c2c4
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:02:43 2008 +1000
@@ -175,7 +207,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 f20a018d16f31c1a0147ce55c5c1e722aedde084
+commit 0fe8defc00119807852d4a27a93c946b0975f9a7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:01:35 2008 +1000
@@ -184,7 +216,7 @@
move domain validate function to separate function
call it from correct places
-commit f7d6c99e83512b204447d7e767050245cbb4dcfb
+commit fcb412ce91c2add47fe980fff892adadb5b90b68
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:00:49 2008 +1000
@@ -193,37 +225,37 @@
If a BO hasn't been dirtied, do a solid fill on VRAM instead of
migrating pages to VRAM
-commit a91c4fbd5aee5f67343c75bac60c71e26f0e43e1
+commit de3aa9d4b97a1c8c45e90b4eae8ffd408ca7dbb1
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 0e526f63691981325dabcd573a12317a39955c1c
+commit 8f8127f7aa91b3362ab0d23a8228077e8e46eff4
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 16093c27570d4600741db95795097cdbd982e86f
+commit 281d8adbad846e93a8588af873e77dd3fe5f8535
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:01 2008 +1000
radeon_gem: fix some misplace ==
-commit f5d271bc48d25a71ebb28df259c149fac58d277f
+commit 408b596180ee9801187dbc7ecf1d8d62b33a4833
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:13:25 2008 +1000
radeon: get buffer upload working
-commit d641df30b7bf37669c351cc3b9966730e448b6b9
+commit 0ab3dbf4a344fefdb4e2508bc5e1d37166105eb7
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 fa958febf783ecaf70d7f29485663a66a2383bce
+commit 6b4abf3528ce8ccbccc3b1965aa7fe9a867514e2
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:11:55 2008 +1000
@@ -232,7 +264,7 @@
We need a buffer zeroing function for before we have
accel running etc
-commit 1937c307b69f414909ab5ed5edb102311fc40d64
+commit 5983b2594314cb63dc5959c4e40799cda0a9f8ce
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:49:16 2008 +1000
@@ -243,55 +275,55 @@
Primarily for the move code when we get a buffer in VRAM, we don't need
to copy the contents just zero them.
-commit 03d6393cd4f19d451a431ded998d00510b760c5a
+commit d5cae241115ca48177ea18e6edd1ca50318493c4
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 e4d94938c158e1081089d3f7967a2ab309353112
+commit bedbe67a192f5e887dbfe21df765756e2ca7b65f
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:35:26 2008 +1000
drm: remove tlb flush logic from ttm
-commit 3958d38e1e813b9336ae49cd564ded90df57d870
+commit f7777d164fd1fc271d82fad9c5db34c086b50d9d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:34:51 2008 +1000
drm: wbinvd is cache coherent no need to ipi
-commit c3626f7b979aa3dd1f307677bc145a2938673737
+commit 56b426bbe9185b354deabbdd424351f02735641d
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 cf6aa44c45ee21808f3e30ded9d4bd14ae1f6e61
+commit 0d376172b21a3ec3a02264bc8e5e6029f627d386
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:16:13 2008 +1000
FEDORA: add radeon copy root patch
-commit 8ffd3f2d6ac84a68b0b1b537cdb26fb635dc58db
+commit b141b286c4a0c6d51ad22a46d4a6c36859f93349
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:15:10 2008 +1000
radeon: fix bug in scratch retreival
-commit e4eb4be9fe14535c0b55f0c0815b510637ca4e19
+commit 266219d447f683601bfc935674a4f72a6b2f8bce
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:14:38 2008 +1000
radeon: add GTT domain
-commit 949adbdd4db02f334d3c7cd62fa0625184ea5600
+commit 7b14f1c59deeb0a21f42948b8db439eb992316ca
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 f5e665b3a3cee48baaa5ad9785a8d2ebd9b383ee
+commit 39417acd369f10d393c48ada6c72445d8d96948a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 14:28:43 2008 +1000
@@ -303,37 +335,37 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 95a92133270db49c86d8f1c14cff6f2061a9baa7
+commit 404a683d929e9050e84e747b4a9914c86ac3304e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:14:56 2008 +1000
disable modeset on < r300
-commit aa7120ad9438127008bf5a23edbafbafe4267167
+commit 3ad39ca001b9676367dbc206491c0337e36b8b32
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 21b278e5d2616629daecfc4c20247b0d5b4ebf2a
+commit d223cf209ef2ea27d150976000cc085ff9b675e3
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:35:55 2008 +1000
radeon: fix LVDS modes problem
-commit adcee8a0b33897b58406256178a4f7f6d5ebd325
+commit 31ae8e77d6eb2f689bc50ba011381fdd29fed837
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 6d897fc28180118504c3b37e951c838c4f28fcaa
+commit 42f365cc318481ed32001ed82a65fee1c1580a5c
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 574b6890103556b0630815aeaf8ab87510d08f18
+commit 06c860cd26b97f03cbe04b4aa4bdaeb4b92a6155
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 15:23:51 2008 +1000
@@ -341,7 +373,7 @@
Need to add to Intel when we get there
-commit 7a7260c2e30e136df2020c66eb941fe3566f4161
+commit 27771cc08e249ad1b0276943ae58f9557aaa6c05
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:38:27 2008 +1000
@@ -349,31 +381,31 @@
This gets RN50 to initialise correctly
-commit 6ef0ad1914d97bf94c75314c6da0dd489c80621f
+commit 192b210ff5641a56acc5ec545b2ea1182ae6ce8b
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:37:25 2008 +1000
radeon: add copy/solid regs for rn50
-commit 582693cab1971d5aaeb395efe1074fd38d9d7913
+commit 9e2acc2c62e2828360cf30ca626f5fe684910315
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 7e218bb4290054d9c3849f204baa94579789ded7
+commit e2ca8ecd5c653688b9cc8a91c642fd3c86096f57
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 09:59:31 2008 +1000
radeon: add quirks from DDX
-commit 5c6038ed70d36dc2bf71cd86983629faaa909d76
+commit 07fe78c61f7764857d5f2d62d206355ebd1a46fc
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:12 2008 +1000
radeon: fix warnings
-commit 4c55b11e929ce6063f71eb9f933a558faa25cfc4
+commit 3f097342211662d9af58c37e6698a19e7ebeca3f
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:47 2008 +1000
@@ -384,31 +416,31 @@
- add debugging for tracing calls
- fix pitch calculation
-commit 70fd2d82fdb01dc3b581253b1dfb9b9c1d3f8801
+commit 1dc90a6f8ec005402d6ef0d0000b69019cde7035
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 0a1a8af5e1d2ffa81061de4e4ba2ee6caf7c9384
+commit e2f9198ac5f453687b617a6e2ba2663b03e7e52d
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 a73209ef04e58ff55155218f5739a20b8bfff7db
+commit a906d86cccd88df4b51e1aaee85684e1414c1773
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 098545153ab5c62bb1da12ab1aa512811e96ccd3
+commit 955cac80f53aa3e2d5acceb1f3d626860d48a6b6
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:53:08 2008 +1000
radeon/atom: implement crtc lock
-commit abccc3f6e09cdc43beafb8016bbd24cda2ad8316
+commit 25cbb993b4e5f0deea4c12a775290eb47dabf928
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:50:15 2008 +1000
@@ -417,7 +449,7 @@
- Add gamma set for legacy chips
- Add 16 bpp gamma set
-commit 6459ec817757f3b096d7fa7216d9bb40795f07f3
+commit 0db2fe1ba7639e69f029d4e5c37b0308ff61a5e2
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:55 2008 +1000
@@ -427,19 +459,19 @@
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
-commit 08668cf6bd2a474c9e55b6d2c714ebdc12e471eb
+commit a613b3c58291c7262499ba14d884b3bd51aedfd0
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:30 2008 +1000
radeon: Add legacy dac detect stubs
-commit c0226a25d70563d4f72a90d88300c84605ed77bc
+commit 6df5c57f9ecb228793cfb91db33d9a1b29b75bb9
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 229038758dd6cd736e9d0d14ed8d2375ecb31397
+commit 56ce42ab90129a7d728442ad348a3c2d8a74f8e9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:48:50 2008 +1000
@@ -447,25 +479,25 @@
- removed save/init/restore chain with set functions
-commit 30ad651bf74b568d917c703f61c473d56a49c56c
+commit 3b0932a6397f09d8adb3106571404289b1f4ff98
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:54:04 2008 +1000
FEDORA: radeon set gart buffers start
-commit df19079258c70194d0a0f7ec23198af33e27bb11
+commit a0332572f5fccef69bff690ebe3fd612ccfdec8c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:52:41 2008 +1000
radeon: command submission remove debug
-commit 7f87b15a51002f3210d8ed11ce27c3d83983fa30
+commit 3f36ffcdfeb921841326cfcc7a8f1e4fefb63f76
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 747ae8fabbec82790e177b6401f46c74d9ef7923
+commit 41a9bb0e8fae6bb919b7c403cf045d7e85a8744d
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:19:05 2008 +1000
@@ -473,19 +505,19 @@
in the correct place in the drm so buffer swaps work again
-commit 9dd9199b81fa711871dfc89478a88a9c18338204
+commit 44b8b48b6b00da7a3e6389cb3bcb8d6a51d89867
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:18:08 2008 +1000
radeon: add mm supported call for userspace
-commit ce9edcd268687a9a20ece68d5dfc72ac9d23bf2d
+commit 9353128519c93f700153d24068beae8f9c45271c
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 c5f3dc17201dd72d37629936e085a8dda8a590d1
+commit 5e1c3d29c8bb0d24583d29b4c9416e748ed8dc58
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 15:57:10 2008 +1000
@@ -494,7 +526,7 @@
This adds the CRTC and PLL setting code, it doesn't work
yet but its all heading in the right direction.
-commit e655643143bedce651b928d074a7c4f79a305fb7
+commit d0db720641ef368559fd7bee097a1c5985fb117a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 13:32:50 2008 +1000
@@ -503,67 +535,67 @@
In theory we should be setting the mapping for the legacy node.
the inode for the control node might be different.
-commit e56ec66c332816f56caf49713fa1aca25c134fa6
+commit 241822918ff8c8f169707181dff8b8a24da1d0ef
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 90df9746484939fcbdac66ca3c3b16f87acf104c
+commit a834758f13a03bdcb3b2fc8e70f5f8ef57445610
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 16:01:22 2008 +1000
radeon: set new memmap on gem enable
-commit ae99db100df21053ac5b6090068f464ebfe8b2e7
+commit aaa864fc11b2915a9807998bea364eef8dfed36f
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 dcf60a1d40139bfc69506a7929f64fc2c4d0d951
+commit 655d0b2b4ae21984a056ebdd19e7a4832126186a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:38 2008 +1000
radeon: set gart table size
-commit 2391bf668d7d426d1b86b156d6b915e8de090881
+commit 6154373c4fb5cf6224aeffd09324f124f1a04b90
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:18 2008 +1000
radeon: fix buffer evict slection
-commit 166865ddd6688686ac7d5688129bb0686c89acba
+commit 822cb91583da0d93f9fa50d06c029e4d3fedf273
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 d3faa4f6a3220996ea02c2e8acd3cb25e51445de
+commit 09f5011d67e0cafc1da7b2aad33aed037603cb15
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 0665b4d4cfadf49a8de4309233a1144eecbc5099
+commit 92aa6dc4d089f009c115bcb0b657f25edc9c9eb5
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 5 11:22:24 2008 +1000
radeon: fix defines so blit works again
-commit 6fcb49ca611e00ac998236bcef9e4ee1d1a67b23
+commit 0c83b0b0065a0ec87bcdefa44f8458b5f5005e92
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 1922ad6fef0e420b3ae2b972b08d23041aa00c13
+commit ee88d6959c5d222c5e4706333f134891e9b8c64a
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:21:22 2008 +1000
drm: fix unneeded debug
-commit 1734f536d4b161b7dceea19ea43d3e204c7dce52
+commit 1b0e34c58f75804f8a954008c931ee606651071d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:47 2008 +1000
@@ -571,49 +603,49 @@
if kms enabled memory manager will be enabled by default
-commit dbffe9683d28b8d93a6950ab47a1e9a053e10605
+commit 93bbccaec3e3f3691dcbd2bbafae3eea03604a82
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:26 2008 +1000
drm: kill bo after driver lastclose
-commit e89731c87081070c8f9e4dce3809335b0a7276d1
+commit a7b10bfa67eec60137f55a639457bde0651f0d60
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 52debd2ba8a189cc1aae7582185561b80ef90154
+commit 6b08921f54b1a5713a3ad434f5b65ab81cd6d93c
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Aug 2 08:06:26 2008 +1000
drm: fix release locking
-commit 45435a275d840f86cd9d3568ac0460ea5ba7990d
+commit 9ce806a95df91dd2f7f4266ae1d7cf44eccc78e7
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 23:39:24 2008 +1000
fix build on powerpc
-commit 58e1bfaeef22179ca917c8bfb0a3fa482e827ba4
+commit f88aac6fb4621168aeefcdff7fb9228c11971656
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 16:55:34 2008 +1000
drm: add radeon modesetting support
-commit db84d6124fe660ad490c3e7b3ee40e96c0dde0f0
+commit 7c4962d78781cee54293487f1cbdea606b4ddaeb
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:07:35 2008 +1000
drm: add modesetting support
-commit eb9c1ca93d321cdfb32ff9273615ba6771e2debc
+commit 1c666edc002f1b74bf55235f936747462a34775d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:06:12 2008 +1000
drm: add TTM VM changes
-commit 51e04da2f8306a10617a3b205e1732de5b6b8dfd
+commit 2d12ab4e00baced8f449c1d8c213ce8ef8001bda
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:24:36 2008 +1000
@@ -621,13 +653,13 @@
This adds the control device nodes also
-commit c9823c49595126884425c74641d62824c7231eae
+commit 74ef7b2718dc16ace74e29a2fbed2f9cdd8ee8ac
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:11:06 2008 +1000
drm: add set/drop master ioctls
-commit f390842b72087c63f9c3c8e5a10bc6db6349b43a
+commit 7495aebe11e73fa3a08bd57bb67697c5aca9adde
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:57 2008 +1000
@@ -637,19 +669,19 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit a8fabd28323a87d95c0c5858cc29089fb710564b
+commit df5dc2674d276245da4f6720eedf33aba541085a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:40 2008 +1000
drm: make sarea_max unsigned long
-commit f8b1f041b4cf58b5e06195f69bf58979ab5fd86b
+commit 187aa3e85586d504b190e34bb8663308abeb11e7
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jul 31 15:27:27 2008 +1000
drm: import TTM basic objects
-commit 7b11f7c24283df70e5f76631d3f8daa941955028
+commit aa4b0695fae370bb7f6460163a768d3722850a72
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -660,7 +692,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit f540d73871f75826da9096ff5f76b9cbb674e410
+commit 6dbed074d3f057d0ef2c7664674202b613716b08
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Jul 22 08:52:16 2008 -0400
@@ -672,7 +704,7 @@
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
-commit edc5293b7e74bd9ae93755dfdf73375a743f4079
+commit 2b820d5eb4d375803e248c0b264bcc5290f9a6bd
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 12:29:38 2008 -0700
@@ -687,7 +719,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d340e4814d081815e6fb47cb90c5a3c6bc6e34e2
+commit 70e1dacc95af9c7ef34e7dfc3b453ae0ccc3ca11
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 12:29:37 2008 -0700
@@ -703,7 +735,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 9128c0d4fd881e1fe9780380307faa14d14d4c52
+commit 8d95ef54a3310fad5f558a84f0fd6792c452cecc
Author: Carlos R. Mafra <crmafra2 at gmail.com>
Date: Wed Jul 30 12:29:37 2008 -0700
@@ -716,7 +748,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit a60cee8d6c685530dea08e457664af2cf6bdd187
+commit ac1b41ac2d7914da373c7527f9a8579cfdc3853b
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jul 30 12:06:12 2008 -0700
@@ -735,7 +767,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 764c89c3707c839dc177d939f846c4079592e00f
+commit 4826aad5b3836072e9b910bbb94623b56c19ee36
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 21 12:53:33 2008 -0700
@@ -747,7 +779,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 3a0980df34c533eb1d5533280f317e53277d354d
+commit 9874228e10e1386ce32c6fd10629b19120a5a62b
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -760,7 +792,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 8088d4447f16e018884abc152b40f67c1f015a10
+commit d367d7dfafe70fa5a1b1166d6e8c083ecf814523
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Tue Aug 5 19:37:25 2008 +0100
@@ -773,7 +805,7 @@
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit e06ef39b6e69bb5459705da0ef6ba66d06235375
+commit 83a61e23d457af97f12e6c2d475f7acc4caf2a8d
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 13:03:43 2008 -0700
@@ -784,7 +816,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit ace8f8454386744c676f748dc1ddbd0755e02dd7
+commit 78ed63058708dede907c063e20f420bfd15e6912
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:21:20 2008 -0700
@@ -794,7 +826,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 11ce22b4fa4e39d41af038945f54d0da3e05fcef
+commit 9280544a990c7bacf5d25a2a4fea88cf222ea763
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jul 29 12:10:39 2008 -0700
@@ -808,7 +840,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 1a1d9d9ceb6d9261bfa3ec1da4848a0e45e81d47
+commit 05603ca82b5a091c43e93622537c54227301fcb5
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Tue Jul 29 11:54:06 2008 -0700
@@ -816,7 +848,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 069b3238e1cc4f98852c77836f1d5a856e7613b2
+commit 865ebcf7c6413fbf87ad574dc3bcaa54372a233d
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:36:08 2008 -0700
@@ -826,7 +858,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit f231aeac9602b38afb7605f9a80a2f7e77547d02
+commit b75b54fd350b8a18ee5e1ee26d5b2b7bf23e794d
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:28:47 2008 -0700
@@ -910,7 +942,7 @@
drm-$(CONFIG_COMPAT) += drm_ioc32.o
diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c
-index c533d0c..947febc 100644
+index c533d0c..802c6e9 100644
--- a/drivers/gpu/drm/ati_pcigart.c
+++ b/drivers/gpu/drm/ati_pcigart.c
@@ -34,9 +34,55 @@
@@ -971,10 +1003,16 @@
{
gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
PAGE_SIZE,
-@@ -44,8 +90,10 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
+@@ -44,12 +90,25 @@ static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
if (gart_info->table_handle == NULL)
return -ENOMEM;
++#ifdef CONFIG_X86
++ /* IGPs only exist on x86 in any case */
++ if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
++ set_memory_uc(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
++#endif
++
+ memset(gart_info->table_handle->vaddr, 0, gart_info->table_size);
return 0;
}
@@ -982,7 +1020,16 @@
static void drm_ati_free_pcigart_table(struct drm_device *dev,
struct drm_ati_pcigart_info *gart_info)
-@@ -63,7 +111,6 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
+ {
++#ifdef CONFIG_X86
++ /* IGPs only exist on x86 in any case */
++ if (gart_info->gart_reg_if == DRM_ATI_GART_IGP)
++ set_memory_wb(gart_info->table_handle->vaddr, gart_info->table_size >> PAGE_SHIFT);
++#endif
+ drm_pci_free(dev, gart_info->table_handle);
+ gart_info->table_handle = NULL;
+ }
+@@ -63,7 +122,6 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
/* we need to support large memory configurations */
if (!entry) {
@@ -990,7 +1037,7 @@
return 0;
}
-@@ -98,17 +145,14 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -98,17 +156,14 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
struct drm_sg_mem *entry = dev->sg;
void *address = NULL;
unsigned long pages;
@@ -1011,7 +1058,7 @@
DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
ret = drm_ati_alloc_pcigart_table(dev, gart_info);
-@@ -116,15 +160,19 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -116,15 +171,19 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
DRM_ERROR("cannot allocate PCI GART page!\n");
goto done;
}
@@ -1034,7 +1081,7 @@
}
pci_gart = (u32 *) address;
-@@ -133,8 +181,6 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -133,8 +192,6 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
pages = (entry->pages <= max_pages)
? entry->pages : max_pages;
@@ -1043,7 +1090,7 @@
for (i = 0; i < pages; i++) {
/* we need to support large memory configurations */
entry->busaddr[i] = pci_map_page(dev->pdev, entry->pagelist[i],
-@@ -146,32 +192,18 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -146,32 +203,18 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
bus_address = 0;
goto done;
}
@@ -1080,7 +1127,7 @@
done:
gart_info->addr = address;
-@@ -179,3 +211,142 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
+@@ -179,3 +222,142 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
return ret;
}
EXPORT_SYMBOL(drm_ati_pcigart_init);
@@ -4342,7 +4389,7 @@
+EXPORT_SYMBOL(drm_bo_pfn_prot);
+
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
-index bde64b8..112ba7a 100644
+index bde64b8..d4e42e0 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -54,9 +54,9 @@ static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
@@ -4409,8 +4456,8 @@
vfree(map->handle);
+ if (master) {
+ if (dev->sigdata.lock == master->lock.hw_lock)
-+ dev->sigdata.lock = NULL;
-+ master->lock.hw_lock = NULL; /* SHM removed */
++ dev->sigdata.lock = &dev->default_lock;
++ master->lock.hw_lock = &dev->default_lock;
+ master->lock.file_priv = NULL;
+ wake_up_interruptible(&master->lock.lock_queue);
+ }
@@ -11367,7 +11414,7 @@
static int drm__vma_info(char *buf, char **start, off_t offset, int request,
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
-index c2f584f..1f842d8 100644
+index c2f584f..1dc2965 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -57,6 +57,14 @@ static int drm_minor_get_id(struct drm_device *dev, int type)
@@ -11443,8 +11490,8 @@
+
+ if (master->lock.hw_lock != &dev->default_lock) {
+ if (dev->sigdata.lock == master->lock.hw_lock)
-+ dev->sigdata.lock = NULL;
-+ master->lock.hw_lock = NULL; /* SHM removed */
++ dev->sigdata.lock = &dev->default_lock;
++ master->lock.hw_lock = &dev->default_lock;
+ master->lock.file_priv = NULL;
+ wake_up_interruptible(&master->lock.lock_queue);
+ }
@@ -12742,7 +12789,7 @@
i915-$(CONFIG_COMPAT) += i915_ioc32.o
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
-index 8897434..24b43cd 100644
+index 8897434..bad0144 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -39,42 +39,100 @@
@@ -12885,7 +12932,7 @@
return 0;
}
-@@ -113,42 +162,33 @@ static int i915_dma_cleanup(struct drm_device * dev)
+@@ -113,42 +162,43 @@ static int i915_dma_cleanup(struct drm_device * dev)
static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -12897,14 +12944,22 @@
- i915_dma_cleanup(dev);
- return -EINVAL;
- }
--
++ master_priv->sarea = drm_getsarea(dev);
++ if (!master_priv->sarea) {
++ DRM_ERROR("can not find sarea!\n");
++ i915_dma_cleanup(dev);
++ return -EINVAL;
++ }
+
- dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
- if (!dev_priv->mmio_map) {
- i915_dma_cleanup(dev);
- DRM_ERROR("can not find mmio map!\n");
- return -EINVAL;
- }
--
++ master_priv->sarea_priv = (drm_i915_sarea_t *)
++ ((u8 *) master_priv->sarea->handle + init->sarea_priv_offset);
+
- dev_priv->sarea_priv = (drm_i915_sarea_t *)
- ((u8 *) dev_priv->sarea->handle + init->sarea_priv_offset);
+ if (init->ring_size != 0) {
@@ -12950,7 +13005,7 @@
}
dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
-@@ -157,36 +197,12 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
+@@ -157,36 +207,12 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
dev_priv->back_offset = init->back_offset;
dev_priv->front_offset = init->front_offset;
dev_priv->current_page = 0;
@@ -12988,7 +13043,7 @@
return 0;
}
-@@ -196,16 +212,6 @@ static int i915_dma_resume(struct drm_device * dev)
+@@ -196,16 +222,6 @@ static int i915_dma_resume(struct drm_device * dev)
DRM_DEBUG("%s\n", __func__);
@@ -13005,7 +13060,7 @@
if (dev_priv->ring.map.handle == NULL) {
DRM_ERROR("can not ioremap virtual address for"
" ring buffer\n");
-@@ -220,9 +226,9 @@ static int i915_dma_resume(struct drm_device * dev)
+@@ -220,9 +236,9 @@ static int i915_dma_resume(struct drm_device * dev)
DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
if (dev_priv->status_gfx_addr != 0)
@@ -13017,7 +13072,7 @@
DRM_DEBUG("Enabled hardware status page\n");
return 0;
-@@ -367,9 +373,10 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
+@@ -367,9 +383,10 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
return 0;
}
@@ -13031,7 +13086,7 @@
{
drm_i915_private_t *dev_priv = dev->dev_private;
struct drm_clip_rect box;
-@@ -413,16 +420,19 @@ static int i915_emit_box(struct drm_device * dev,
+@@ -413,16 +430,19 @@ static int i915_emit_box(struct drm_device * dev,
static void i915_emit_breadcrumb(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -13056,7 +13111,7 @@
OUT_RING(dev_priv->counter);
OUT_RING(0);
ADVANCE_LP_RING();
-@@ -486,7 +496,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
+@@ -486,7 +506,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
return ret;
}
@@ -13065,7 +13120,7 @@
BEGIN_LP_RING(2);
if (IS_I965G(dev)) {
OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | MI_BATCH_NON_SECURE_I965);
-@@ -514,17 +524,21 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
+@@ -514,17 +534,21 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
static int i915_dispatch_flip(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -13089,7 +13144,7 @@
OUT_RING(0);
ADVANCE_LP_RING();
-@@ -546,16 +560,16 @@ static int i915_dispatch_flip(struct drm_device * dev)
+@@ -546,16 +570,16 @@ static int i915_dispatch_flip(struct drm_device * dev)
OUT_RING(0);
ADVANCE_LP_RING();
@@ -13110,7 +13165,7 @@
return 0;
}
-@@ -579,9 +593,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
+@@ -579,9 +603,10 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -13122,7 +13177,7 @@
drm_i915_batchbuffer_t *batch = data;
int ret;
-@@ -602,7 +617,8 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
+@@ -602,7 +627,8 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
ret = i915_dispatch_batchbuffer(dev, batch);
@@ -13132,7 +13187,7 @@
return ret;
}
-@@ -610,9 +626,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
+@@ -610,9 +636,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -13144,7 +13199,7 @@
drm_i915_cmdbuffer_t *cmdbuf = data;
int ret;
-@@ -635,7 +652,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
+@@ -635,7 +662,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
return ret;
}
@@ -13154,7 +13209,7 @@
return 0;
}
-@@ -663,7 +681,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
+@@ -663,7 +691,7 @@ static int i915_getparam(struct drm_device *dev, void *data,
switch (param->param) {
case I915_PARAM_IRQ_ACTIVE:
@@ -13163,7 +13218,7 @@
break;
case I915_PARAM_ALLOW_BATCHBUFFER:
value = dev_priv->allow_batchbuffer ? 1 : 0;
-@@ -671,6 +689,12 @@ static int i915_getparam(struct drm_device *dev, void *data,
+@@ -671,6 +699,12 @@ static int i915_getparam(struct drm_device *dev, void *data,
case I915_PARAM_LAST_DISPATCH:
value = READ_BREADCRUMB(dev_priv);
break;
@@ -13176,7 +13231,7 @@
default:
DRM_ERROR("Unknown parameter %d\n", param->param);
return -EINVAL;
-@@ -697,8 +721,6 @@ static int i915_setparam(struct drm_device *dev, void *data,
+@@ -697,8 +731,6 @@ static int i915_setparam(struct drm_device *dev, void *data,
switch (param->param) {
case I915_SETPARAM_USE_MI_BATCHBUFFER_START:
@@ -13185,7 +13240,7 @@
break;
case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:
dev_priv->tex_lru_log_granularity = param->value;
-@@ -749,8 +771,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
+@@ -749,8 +781,8 @@ static int i915_set_status_page(struct drm_device *dev, void *data,
dev_priv->hw_status_page = dev_priv->hws_map.handle;
memset(dev_priv->hw_status_page, 0, PAGE_SIZE);
@@ -13196,7 +13251,7 @@
dev_priv->status_gfx_addr);
DRM_DEBUG("load hws at %p\n", dev_priv->hw_status_page);
return 0;
-@@ -776,6 +798,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -776,6 +808,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
memset(dev_priv, 0, sizeof(drm_i915_private_t));
dev->dev_private = (void *)dev_priv;
@@ -13204,7 +13259,7 @@
/* Add register map (needed for suspend/resume) */
base = drm_get_resource_start(dev, mmio_bar);
-@@ -784,6 +807,30 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
+@@ -784,6 +817,30 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
ret = drm_addmap(dev, base, size, _DRM_REGISTERS,
_DRM_KERNEL | _DRM_DRIVER,
&dev_priv->mmio_map);
@@ -13235,7 +13290,7 @@
return ret;
}
-@@ -791,15 +838,41 @@ int i915_driver_unload(struct drm_device *dev)
+@@ -791,15 +848,41 @@ int i915_driver_unload(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = dev->dev_private;
@@ -13277,7 +13332,7 @@
void i915_driver_lastclose(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
-@@ -807,6 +880,8 @@ void i915_driver_lastclose(struct drm_device * dev)
+@@ -807,6 +890,8 @@ void i915_driver_lastclose(struct drm_device * dev)
if (!dev_priv)
return;
@@ -13286,7 +13341,7 @@
if (dev_priv->agp_heap)
i915_mem_takedown(&(dev_priv->agp_heap));
-@@ -819,6 +894,13 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
+@@ -819,6 +904,13 @@ void i915_driver_preclose(struct drm_device * dev, struct drm_file *file_priv)
i915_mem_release(dev, file_priv, dev_priv->agp_heap);
}
@@ -13300,7 +13355,7 @@
struct drm_ioctl_desc i915_ioctls[] = {
DRM_IOCTL_DEF(DRM_I915_INIT, i915_dma_init, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
DRM_IOCTL_DEF(DRM_I915_FLUSH, i915_flush_ioctl, DRM_AUTH),
-@@ -837,6 +919,22 @@ struct drm_ioctl_desc i915_ioctls[] = {
+@@ -837,6 +929,22 @@ struct drm_ioctl_desc i915_ioctls[] = {
DRM_IOCTL_DEF(DRM_I915_GET_VBLANK_PIPE, i915_vblank_pipe_get, DRM_AUTH ),
DRM_IOCTL_DEF(DRM_I915_VBLANK_SWAP, i915_vblank_swap, DRM_AUTH),
DRM_IOCTL_DEF(DRM_I915_HWS_ADDR, i915_set_status_page, DRM_AUTH),
@@ -18123,10 +18178,10 @@
+}
diff --git a/drivers/gpu/drm/i915/i915_init.c b/drivers/gpu/drm/i915/i915_init.c
new file mode 100644
-index 0000000..f2c9a3a
+index 0000000..06f2ecb
--- /dev/null
+++ b/drivers/gpu/drm/i915/i915_init.c
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2007 Intel Corporation
+ * Jesse Barnes <jesse.barnes at intel.com>
@@ -18147,17 +18202,6 @@
+ if (!master_priv)
+ return -ENOMEM;
+
-+ /* prebuild the SAREA */
-+ sareapage = max(SAREA_MAX, PAGE_SIZE);
-+ ret = drm_addmap(dev, 0, sareapage, _DRM_SHM, _DRM_CONTAINS_LOCK|_DRM_DRIVER,
-+ &master_priv->sarea);
-+ if (ret) {
-+ DRM_ERROR("SAREA setup failed\n");
-+ return ret;
-+ }
-+ master_priv->sarea_priv = master_priv->sarea->handle + sizeof(struct drm_sarea);
-+ master_priv->sarea_priv->pf_current_page = 0;
-+
+ master->driver_priv = master_priv;
+ return 0;
+}
@@ -18168,16 +18212,13 @@
+
+ if (!master_priv)
+ return;
-+
-+ if (master_priv->sarea)
-+ drm_rmmap_locked(dev, master_priv->sarea);
+
+ drm_free(master_priv, sizeof(*master_priv), DRM_MEM_DRIVER);
+
+ master->driver_priv = NULL;
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index df03611..8371abc 100644
+index df03611..965ec74 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -31,12 +31,35 @@
@@ -18449,7 +18490,17 @@
*/
int i915_irq_emit(struct drm_device *dev, void *data,
struct drm_file *file_priv)
-@@ -414,20 +484,6 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -381,7 +451,8 @@ int i915_irq_emit(struct drm_device *dev, void *data,
+ drm_i915_irq_emit_t *emit = data;
+ int result;
+
+- LOCK_TEST_WITH_RETURN(dev, file_priv);
++ if (file_priv->master->lock.hw_lock != &dev->default_lock)
++ LOCK_TEST_WITH_RETURN(dev, file_priv);
+
+ if (!dev_priv) {
+ DRM_ERROR("called with no initialization\n");
+@@ -414,20 +485,6 @@ int i915_irq_wait(struct drm_device *dev, void *data,
return i915_wait_irq(dev, irqwait->irq_seq);
}
@@ -18470,7 +18521,7 @@
/* Set the vblank monitor pipe
*/
int i915_vblank_pipe_set(struct drm_device *dev, void *data,
-@@ -435,6 +491,7 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -435,6 +492,7 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
{
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_pipe_t *pipe = data;
@@ -18478,7 +18529,7 @@
if (!dev_priv) {
DRM_ERROR("called with no initialization\n");
-@@ -446,9 +503,20 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -446,9 +504,20 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
return -EINVAL;
}
@@ -18501,7 +18552,7 @@
return 0;
}
-@@ -465,11 +533,11 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -465,11 +534,11 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
return -EINVAL;
}
@@ -18516,7 +18567,7 @@
pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
return 0;
-@@ -482,18 +550,19 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
+@@ -482,18 +551,19 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -18538,7 +18589,7 @@
DRM_DEBUG("Rotation not supported\n");
return -EINVAL;
}
-@@ -587,9 +656,9 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -587,9 +657,9 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -18551,7 +18602,7 @@
}
void i915_driver_irq_postinstall(struct drm_device * dev)
-@@ -602,7 +671,22 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
+@@ -602,7 +672,22 @@ void i915_driver_irq_postinstall(struct drm_device * dev)
if (!dev_priv->vblank_pipe)
dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A;
@@ -18575,7 +18626,7 @@
DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
}
-@@ -614,10 +698,10 @@ void i915_driver_irq_uninstall(struct drm_device * dev)
+@@ -614,10 +699,10 @@ void i915_driver_irq_uninstall(struct drm_device * dev)
if (!dev_priv)
return;
@@ -30404,7 +30455,7 @@
+ return NULL;
+}
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
-index 3331f88..40f6cbc 100644
+index 248ab4a..e96037e 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -31,6 +31,7 @@
@@ -32550,7 +32601,7 @@
+
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
new file mode 100644
-index 0000000..a9cb635
+index 0000000..2e516a1
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -0,0 +1,645 @@
@@ -32750,7 +32801,7 @@
+ radeon_crtc->lut_b[i] = i;
+ }
+
-+ if (dev_priv->is_atom_bios && dev_priv->chip_family > CHIP_RS690)
++ if (dev_priv->is_atom_bios && radeon_is_avivo(dev_priv))
+ radeon_atombios_init_crtc(dev, radeon_crtc);
+ else
+ radeon_legacy_init_crtc(dev, radeon_crtc);
@@ -33200,7 +33251,7 @@
+
+}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
-index 637bd7f..1740aec 100644
+index 637bd7f..36335a7 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -35,12 +35,20 @@
@@ -33287,7 +33338,7 @@
driver.num_ioctls = radeon_max_ioctl;
+
+ /* if enabled by default */
-+#ifdef CONFIG_DRM_RADEON_KMS
++#if defined(CONFIG_DRM_RADEON_KMS) && defined(CONFIG_X86)
+ driver.driver_features |= DRIVER_MODESET;
+ if (radeon_modeset == 0)
+ driver.driver_features &= ~DRIVER_MODESET;
@@ -36113,10 +36164,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..eceb520
+index 0000000..24c806a
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1336 @@
+@@ -0,0 +1,1337 @@
+/*
+ * Copyright 2008 Red Hat Inc.
+ *
@@ -36602,7 +36653,7 @@
+ dev_priv->chip_family == CHIP_RV380 ||
+ dev_priv->chip_family == CHIP_R420 ||
+ dev_priv->chip_family == CHIP_RV410 ||
-+ dev_priv->chip_family >= CHIP_RS600) {
++ radeon_is_avivo(dev_priv)) {
+ uint32_t temp = RADEON_READ(RADEON_HOST_PATH_CNTL);
+ temp |= RADEON_HDP_APER_CNTL;
+ RADEON_WRITE(RADEON_HOST_PATH_CNTL, temp);
@@ -36634,7 +36685,7 @@
+ uint32_t vram;
+ uint32_t accessible, bar_size;
+
-+ if ((dev_priv->chip_family <= CHIP_RV515) && (dev_priv->flags & RADEON_IS_IGP)) {
++ if (!radeon_is_avivo(dev_priv) && (dev_priv->flags & RADEON_IS_IGP)) {
+ uint32_t tom = RADEON_READ(RADEON_NB_TOM);
+
+ vram = (((tom >> 16) - (tom & 0xffff) + 1) << 6);
@@ -36732,17 +36783,18 @@
+ } else if (!(dev_priv->flags & RADEON_IS_AGP)) {
+ /* allocate PCI GART table */
+ dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
++ dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
++ if (dev_priv->flags & RADEON_IS_IGPGART)
++ dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
++ else
++ dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
++
+ ret = drm_ati_alloc_pcigart_table(dev, &dev_priv->gart_info);
+ if (ret) {
+ DRM_ERROR("cannot allocate PCI GART page!\n");
+ return -EINVAL;
+ }
+
-+ dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
-+ if (dev_priv->flags & RADEON_IS_IGPGART)
-+ dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_IGP;
-+ else
-+ dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI;
+ dev_priv->gart_info.addr = dev_priv->gart_info.table_handle->vaddr;
+ dev_priv->gart_info.bus_addr = dev_priv->gart_info.table_handle->busaddr;
+ }
@@ -49371,7 +49423,7 @@
/** Maximum number of drawables in the SAREA */
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
-index 05c66cf..2195856 100644
+index 05c66cf..7d88a21 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -63,7 +63,7 @@ typedef struct _drm_i915_init {
@@ -49418,7 +49470,7 @@
} drm_i915_sarea_t;
/* Flags for perf_boxes
-@@ -143,6 +155,22 @@ typedef struct _drm_i915_sarea {
+@@ -143,10 +155,26 @@ typedef struct _drm_i915_sarea {
#define DRM_I915_GET_VBLANK_PIPE 0x0e
#define DRM_I915_VBLANK_SWAP 0x0f
#define DRM_I915_HWS_ADDR 0x11
@@ -49441,7 +49493,12 @@
#define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
#define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-@@ -160,11 +188,27 @@ typedef struct _drm_i915_sarea {
+-#define DRM_IOCTL_I915_FLIP DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
++#define DRM_IOCTL_I915_FLIP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t)
+ #define DRM_IOCTL_I915_BATCHBUFFER DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
+ #define DRM_IOCTL_I915_IRQ_EMIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
+ #define DRM_IOCTL_I915_IRQ_WAIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
+@@ -160,11 +188,39 @@ typedef struct _drm_i915_sarea {
#define DRM_IOCTL_I915_SET_VBLANK_PIPE DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
#define DRM_IOCTL_I915_GET_VBLANK_PIPE DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
#define DRM_IOCTL_I915_VBLANK_SWAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
@@ -49461,6 +49518,18 @@
+#define DRM_IOCTL_I915_GEM_SW_FINISH DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_SW_FINISH, struct drm_i915_gem_sw_finish)
+#define DRM_IOCTL_I915_GEM_SET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_SET_TILING, struct drm_i915_gem_set_tiling)
+#define DRM_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct drm_i915_gem_get_tiling)
++
++/* Asynchronous page flipping:
++ */
++typedef struct drm_i915_flip {
++ /*
++ * This is really talking about planes, and we could rename it
++ * except for the fact that some of the duplicated i915_drm.h files
++ * out there check for HAVE_I915_FLIP and so might pick up this
++ * version.
++ */
++ int pipes;
++} drm_i915_flip_t;
/* Allow drivers to submit batchbuffers directly to hardware, relying
* on the security mechanisms provided by hardware.
@@ -49470,7 +49539,7 @@
int start; /* agp offset */
int used; /* nr bytes in use */
int DR1; /* hw flags for GFX_OP_DRAWRECT_INFO */
-@@ -200,6 +244,8 @@ typedef struct drm_i915_irq_wait {
+@@ -200,6 +256,8 @@ typedef struct drm_i915_irq_wait {
#define I915_PARAM_IRQ_ACTIVE 1
#define I915_PARAM_ALLOW_BATCHBUFFER 2
#define I915_PARAM_LAST_DISPATCH 3
@@ -49479,7 +49548,7 @@
typedef struct drm_i915_getparam {
int param;
-@@ -267,4 +313,305 @@ typedef struct drm_i915_hws_addr {
+@@ -267,4 +325,305 @@ typedef struct drm_i915_hws_addr {
uint64_t addr;
} drm_i915_hws_addr_t;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.927
retrieving revision 1.928
diff -u -r1.927 -r1.928
--- kernel.spec 4 Sep 2008 21:45:56 -0000 1.927
+++ kernel.spec 5 Sep 2008 01:28:57 -0000 1.928
@@ -608,7 +608,6 @@
# nouveau + drm fixes
Patch1811: drm-modesetting-radeon.patch
-Patch1812: fixup-dri2-kms-merge.patch
Patch1813: drm-nouveau.patch
# kludge to make ich9 e1000 work
@@ -1156,7 +1155,6 @@
# Nouveau DRM + drm fixes
ApplyPatch drm-modesetting-radeon.patch
-ApplyPatch fixup-dri2-kms-merge.patch
ApplyPatch drm-nouveau.patch
# linux1394 git patches
@@ -1749,6 +1747,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Fri Sep 05 2008 Dave Airlie <airlied at redhat.com>
+- modesetting updates - fix AMD rs690 - roll in krh dri2 patch
+
* Thu Sep 4 2008 David Woodhouse <David.Woodhouse at intel.com>
- 2.6.27-rc5-git6
--- fixup-dri2-kms-merge.patch DELETED ---
More information about the fedora-extras-commits
mailing list