rpms/kernel/devel drm-modesetting-radeon.patch, 1.33, 1.34 kernel.spec, 1.1024, 1.1025
Dave Airlie
airlied at fedoraproject.org
Wed Oct 8 07:04:28 UTC 2008
- Previous message (by thread): rpms/libchewing/F-9 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 libchewing.spec, 1.18, 1.19 sources, 1.4, 1.5
- Next message (by thread): rpms/libchewing/F-8 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 libchewing.spec, 1.16, 1.17 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8621
Modified Files:
drm-modesetting-radeon.patch kernel.spec
Log Message:
- radeon - hopefully fix suspend/resume - reenable HW migration
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/drm-modesetting-radeon.patch,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- drm-modesetting-radeon.patch 6 Oct 2008 06:28:00 -0000 1.33
+++ drm-modesetting-radeon.patch 8 Oct 2008 07:04:27 -0000 1.34
@@ -1,4 +1,58 @@
-commit 3f61a04bd2af318f8fdfa2558bac646b069a7b73
+commit 454a486b367c32e1b3a75786c9b2a7d1c891ff49
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Oct 8 16:57:12 2008 +1000
+
+ radeon: fixup suspend/resume bus master enable
+
+commit ed52f212db10d951b2538195d4a6281221090002
+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 d0329c3df7684c4a9fbb16abbb83a753724ceb3c
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Oct 8 16:53:43 2008 +1000
+
+ radeon: fix buffer copying for VRAM->TT
+
+commit f24c0505dafd9d4565553fc814f96b6304112f48
+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 a4602f969a3dd96d5601a6f8a49e584ef2c0cc68
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Oct 7 16:34:12 2008 +1000
+
+ drm: remove stray debug code
+
+commit 40789060ef6fdf47e6bf9f1a7ee016ad1af6d75b
+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 24e813461a070919d02719e88e2122aa56bd9abb
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Oct 7 16:30:09 2008 +1000
+
+ drm: add discardable flag.
+
+ This discards memory contents on suspend/resume with the
+ hope the upper layers know something we don't.
+
+commit 2001c87cdde250b3c76f057241b0116904d8fa87
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Oct 7 16:27:31 2008 +1000
+
+ drm/radeon: initial suspend/resume fix.
+
+ This enables the evict code and also sets radeon up
+ to allow evict from VRAM to LOCAL
+
+commit e80dfa0ae7d8511114ce43cd9942807a3717737a
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 6 16:20:38 2008 +1000
@@ -6,31 +60,31 @@
fixup the interface between gem and ttm for alignment. makes Xv work better
-commit 18c1f0f0716ac15b594d0d7e65105859048aef41
+commit 9ba0602db94c4a9ba94cd1a0b65ef25518aa61ff
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 9ca2633c13cdba9da4fa76402bf6fdf81a104c89
+commit 73bf9b361531a1b26e1eec3c0cd8bd5282227478
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 1c32cd10e4e738ed8ea95fac24a52788ccebff36
+commit d2762eef57ac794e26b5c6e8663d37b5c74c6a9e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 1 11:25:54 2008 +1000
drm: fixup clean flag handling properly
-commit 4d996424e3240b4e507f3f42619dc65d3c0397b2
+commit 66da4767e1cbb3d73cd5db4578af781e5c3b1287
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 1bf07074508ff2b206ed84ad775f0a1c8bd94dd2
+commit 6eedb63eee7f346e0b57a922c2a3e30f4b947af6
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:56:32 2008 +1000
@@ -39,43 +93,43 @@
default is legacy modesetting. pass module option r4xx_atom
to try using atom on r4xx.
-commit dc9923a8efbf8ed64f5b066470c9ddbcfd2dd6d7
+commit 7b42c85b3ed84a8c705737ddc7c12eda949ee260
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 1e6c33b4f9582ad10e0122110776e6ed40b01e5e
+commit a9dacedabeb3892bb6d847107a6b45269c0939de
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 29 14:50:47 2008 +1000
radeon: add r600 modesetting registers writes
-commit 6101f4eb7947b27665576a0abd4aec9740bc1f84
+commit 3712137a7592675adef1f0d9c7b272aec28de521
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 9cfb2507af5c2459e957e692875126873ed14227
+commit fca69c357c5fffa7be493f8a90e0e7f0256bb922
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 c3100d0d849205bcffe3b180f151b94b8792969e
+commit dabee5c48b9c50660f0e2f6859dfeed6ccb39817
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 23 16:34:55 2008 +1000
radeon: fix minor cursor disappearing issues
-commit d2788cc21add1e650e3c448e9869ff5cc2baed6e
+commit 06e3646992b8cd6415ec96af886ad336ef8dce5d
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 e4475c94774e4044c4812d6a86ff3f9afbc0a3bd
+commit 048a1ea727e566a3f2708757a99d4e98896bf319
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 12:00:57 2008 -0400
@@ -84,31 +138,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 47c9a2962fe35ee252c5b6ac6f9ffb193e89cea7
+commit 5cfa0ea8a9c27f552ec76ad9ee086652ea61c4d0
Author: Dave Airlie <airlied at linux.ie>
Date: Sun Sep 21 09:48:51 2008 +1000
drm: fixups on top of rebase
-commit 6eabb50b9e2b44d050fea1975bdf3b7432ad9a47
+commit df6d9796253b08ea4c104f0f8cdb30099b1e6bd4
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 03:08:05 2008 +1000
radeon: rmx_fixup() fixes for legacy chips
-commit a54fbe546ca1ad93d8c10af84ee7d8ed71a84fd8
+commit 1fba7ac085362a6d1e01b9dc45e719fb822e4451
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 01:55:27 2008 +1000
radeon: fix combios
-commit 77b951cf9313af00b12982f6c92084d3b9443f92
+commit e99964f24dc77bc460025b2bbae03d2e527e1dbc
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Sep 19 09:17:36 2008 +1000
radeon: port Alexs patches from modesetting-gem
-commit fd6e0a93f53c75804d9673f3ae08e134676222e3
+commit 26bf5e95519f1861e3660a11a76956c044bc683c
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:10:29 2008 -0400
@@ -117,7 +171,7 @@
Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
-commit bdffcb336dc50ca3d79e079201d0a4748d1f5872
+commit 5c63a2b2169e9c0eeb89b95709deeb63f38ba0c1
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:07:50 2008 -0400
@@ -126,25 +180,25 @@
The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
-commit 75d57c83477a677213a055257c4d6dc5308d4dd3
+commit 799324fd40350ff93f7e7678fc464c1d9735aad4
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 8e1a3b481bf62fd6da776ea41c9f0d8e054012d9
+commit 7496041bcbaa7c8d0c33c56e54bdd7824637da10
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:55:14 2008 +1000
radeon: further LVDS fixes
-commit 404373b8e8f71e5931d4aedbad1796304ffb319e
+commit 4ab919d5e0eb566e2ddd3cb6c54e578ef268ff69
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:54:12 2008 +1000
radeon: legacy lvds updates
-commit 8e2978ca72645194371bf18eda59adc107964c94
+commit 8d7456059a7bf3e22f3f2e88f44f9cb4d0eb4d36
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:26:27 2008 +1000
@@ -152,7 +206,7 @@
just fallback around busted stuff for now
-commit 6f3d287f6a32bfe15f6a88e0d951cbb44cec6845
+commit 3854dc7f286e5f36cca8e9ec5a41d58b57b9d48f
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:25:18 2008 +1000
@@ -160,13 +214,13 @@
also dirty buffer on validate
-commit aab1a86a1ff5a26a47ed1da6b31db183dc82e752
+commit 9c9e2c1aece38c746e34c6f9a0dc9a1e7ec6f413
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 17:13:32 2008 +1000
radeon: disable blit moves
-commit e71e58a40a641ab64450dcbdc1aa4b452864a4ed
+commit 5749eeef7fd08232f7bf0b4154371451a4763709
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 16:18:27 2008 +1000
@@ -174,73 +228,73 @@
Normally this will be due to an AGP driver needing updating
-commit abb1474b5a097a2b87d0cd951a41d203e0eb7de4
+commit 1a3a687413fd9ef01ed805a8592482f1ff6957a8
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 ba2910e271403f3313eaa7f3afb5f285f5dd78ba
+commit e84978c78e1d964600726eb919dfc894633fe844
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:08 2008 +1000
radeon: fix return value
-commit 03af764eb6c0fd263b56298c9526b4130f8ecc3c
+commit 0a1bf57a0c3f1610860af3d9fdaf3021aa787597
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:34:39 2008 +1000
radeon: fixup reference counting properly
-commit 9e76ea7df787b21e9e9000d731c79ee8b5bcf05b
+commit f2e53903f4464ac7f8cd2dc0547475123b9ec13d
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 5453d3024e14cfd6ec44e3821b10de897dbd5518
+commit cfedae7abe515d556d63547db9d23760cf78ebe1
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 11:37:26 2008 +1000
radeon: remove unneeded debugging
-commit 5841015c1d9c5f5a41f31b6b24a767fca425e2b4
+commit 49331440212dfd28f716009ebcfbfe0f4f207023
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 91ba3a6483e2dafb55efd3ff8575a40e276f5b18
+commit 77877fc2078923cbd6aeb73db29bf265d68ff807
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:27:48 2008 +1000
radeon: disable debugging that sneaky itself on
-commit cc2661a76d3ab91d2179235fc5345cedde6c0cfc
+commit e8d77ee82946665e0655f66de8ab8c53d18b7b3c
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:20:44 2008 +1000
radeon: make text reserve 256k
-commit 66cb770c48efcc534f3cdf8d2eb4d06c3da0d654
+commit c7971e047685b2c3b2bc5927eb068c4d9b159464
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 8bfc0a8e576da1875ce4a8f41db9bc46c88d7dc7
+commit 7edfc8c4a317dfedc1ad547de5abd0550fca302b
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 c1e37efd45904e5aef1769177e58404587b0e9a2
+commit f7a11d88c8067c20b9e25da3abfa99f1f603b7c9
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 16:12:59 2008 +1000
radeon: further suspend/resume support
-commit dcbffc4303ac3adae01a99161a26067066174b83
+commit d8a5bb7d3c09e7d2ca3da1624425b28baeb7e512
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 14:52:15 2008 +1000
@@ -248,19 +302,19 @@
this gets us back to fbcon.. its dirty like zebra
-commit b0bc4b93e751a9d7cade864fb67924a93fa9031a
+commit a93d656019c15126b9d2bfdc95b59d4739a91918
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 02aebf77c7a9c233741e69a7ff07e61105c7866e
+commit c5a610d8cf88c3b688ec448249a343213eaadab2
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 a451947b272eb369950479bf12b1ee1a8e1b95a7
+commit 0a121f4dd6d20a2ed7cbd453f65f233261cbfd96
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 10:46:17 2008 +1000
@@ -268,13 +322,13 @@
Allocate the rs480/690 tables from uncached memory.
-commit aaa6aa892b4b5c0e09766c435d1aa2594e078d7f
+commit 8dedf8c4732d5be3422ea02627ccc5d048871ac0
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 4 11:58:08 2008 +1000
drm/radeon: fixup some avivo/rs690 checks
-commit 81a9897413a7f7147aa97b74a71fc57566f82efd
+commit efb73b8df9dcf01588925a3c0287563bf61265cf
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 09:59:02 2008 +1000
@@ -282,7 +336,7 @@
also change name from text to nomodeset
-commit bdf4081486f4229b6fefce0b6da74c50cbdcf340
+commit 942d4a75ffff3159c3258a78c1e47e702a655546
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -290,13 +344,13 @@
also don't explode on lack of DDC
-commit 566954c41d7f1f4d68cbfc8fe8009afa3f5b3651
+commit 4f6d55736eb84ca589c8fc97ea8cfe812e024818
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 18:31:50 2008 +1000
drm: fix dev->master convert
-commit 68fd713555c810b419ac074bdbbf587258fff913
+commit 12e0188be0aec02b227548c17818b1578d83c92a
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:26:11 2008 -0400
@@ -306,7 +360,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit a038eeebbb86277bcfc9850a0af98007ceb4a6d7
+commit dae5fb4a0a51447f1403168c28fd02934741600c
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:24:13 2008 -0400
@@ -318,7 +372,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 7dc370b417bf18ef6713b939290bd38f14fb518f
+commit 0a5231d66ccb3fe0d2864b0ca7689f71ec400887
Author: Kristian Høgsberg <krh at redhat.com>
Date: Tue Aug 12 22:39:54 2008 -0400
@@ -331,13 +385,13 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 759fb03f538100fa20a9cd3faa562841e8f71f5a
+commit 1b5b247de10c2c420e5895180f5f27be13171580
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:49 2008 +1000
radeon: fix LVDS on atombios - typos
-commit c0e91932d03cd28136a7afdf798b725aafbaace0
+commit 5c5ab73886222680256ccb521e6fa77c2a925f1e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:34 2008 +1000
@@ -345,43 +399,43 @@
This should do a better job at picking the initial configuration crtcs
-commit 95eb8784101025af9ac0c2cc9a196ccada346bb8
+commit ad5c1a03f631100e9fdb2f5816e650c4859a70d9
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 f273946f84c772a4fe64445a40693d2c52bd4428
+commit 3f6ea658ce73c27c3cfd88eaa57c7633e2c7199d
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 3dd8251440f26859871ff819a01c0fa357e6b6f7
+commit 519e6b3f211586db0ca18bb4557eab484b7f557a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 15:39:17 2008 +1000
radeon: fix after rebase
-commit e9df0c729ba852a0900e6ebae576c602bb424bd9
+commit ab4149e0b25a49717138047bde842af4c17a0d09
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 13:43:23 2008 +1000
drm: fix whitespace
-commit 9ecc3725ddac17250ebe1c2c1a34d2e0abc94e30
+commit e490a4b6ceb62148b12a1a9d52e6333fa35413ab
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 92203c85a8cacb72d4b665423d7cb2cd77dee0e2
+commit 57b5c5f0f21491e704b5049b922d49d7d9687258
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 9ce50f3c254af1fd3f814e4a85a548360fcffd22
+commit 3f12b03a9275e2eda61b3cc63460060708af2003
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:37 2008 +1000
@@ -390,7 +444,7 @@
- done: primary dac, vga on tvdac
- todo: ext dac, tv on tvdac
-commit e260a38f61a334b2812e0e60a60b224d9ca9730a
+commit 86b186f8cf8f055608f20f000f9a1f1deff354b6
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:11 2008 +1000
@@ -398,25 +452,25 @@
- todo: updated connected status
-commit a14969cf384833116dc280e45dede52b6547a023
+commit 628e8c17db39261950fc1cd26505b511a86babbb
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:54 2008 +1000
radeon: remove unused legacy state
-commit ade87233e6bfcc124ebc88e28532f98faf425213
+commit 3ec7c301a7a385b5cd4269bec567e866c3130235
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 748624dd96fb81367614f94cafd50c1ce466d9d1
+commit e76498cf78c1cfb4895aa83fdada2f7821da1534
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:03:13 2008 +1000
x86: export pat_enabled
-commit 8598307506876c9e5118798557dcf16ab1302f7b
+commit 1676735c71b82fb76c2379138cbf573f5c207acf
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:02:43 2008 +1000
@@ -425,7 +479,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 078620e2269dae1af20d73f3ffd933ad06c59403
+commit 1fa98306911f51c0780f3c074b87661909f82fbb
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:01:35 2008 +1000
@@ -434,7 +488,7 @@
move domain validate function to separate function
call it from correct places
-commit 308c8b29e986b34d26991cfcf1d7519627f48c0c
+commit 848c7623fd7260e7ecdc18967256b616341654fb
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:00:49 2008 +1000
@@ -443,37 +497,37 @@
If a BO hasn't been dirtied, do a solid fill on VRAM instead of
migrating pages to VRAM
-commit a70da1f8abd6927e25f9e69c50cf1c502bee858b
+commit 04ac0ce19725db9a6afdba9d62a369ce700d0b4a
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 098f735f80938e3206ec460bd4c314ae56e31b54
+commit 8b66ebf60bea17ceeec56b41470e1c4ca88cae3c
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 0d351ff564859a7fa5c2e14aa0064db15b3a323b
+commit 7cdbab32452e0b2becd9c2ade4bfea7442a12dca
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:01 2008 +1000
radeon_gem: fix some misplace ==
-commit c99b0e74e2339f20045950804142de543df91f02
+commit 93cffec725b5649df1e9c197b7734f7496e6261c
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:13:25 2008 +1000
radeon: get buffer upload working
-commit b8e3d8fa89294e8e3f64a92a6b4db7afd6468abf
+commit b8a38e5091004d2e5b0dece10fd84e2ad4a2288e
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 1bee81d3b6552854c1c659bc4bbba6d746eeabb8
+commit 19bf06c6aac17a7751b9668fdb79536bcaf210d9
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:11:55 2008 +1000
@@ -482,7 +536,7 @@
We need a buffer zeroing function for before we have
accel running etc
-commit d14663cbdb7297af0b452028513cf17c6876c5e2
+commit 4e42bc21493ab6ae1ff40d3e9ca66a4776cf2cd5
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:49:16 2008 +1000
@@ -493,55 +547,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 3d6b76b83a74a45c9ca8ce01339c4226e2adee72
+commit 7314e3cffdda5a5f54062709bd2142237aa8cd3a
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 1dab38130dcfe701f8e768db508f69b54704951b
+commit 6e1b6537a5292726379da3fa1fd85dc9d463972d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:35:26 2008 +1000
drm: remove tlb flush logic from ttm
-commit 9a06bc7339988b434f7b296203914a693aa2c569
+commit d02b2272f94ee93f27e300796732d66555815347
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 8bcb956c767e19af369ae8dd84e25dd8f913304a
+commit 589043b22480d2089afdcda548ee2c692164cbd9
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 07d8cae83ae8ec99f320e7f9bc835728b21ef0ba
+commit 56b6abd293fd38a09e065e01c217143357f28a15
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:16:13 2008 +1000
FEDORA: add radeon copy root patch
-commit dd53b8e59b18f70d3079063b29bfd7dc25d641f3
+commit 0079943fb6254b56cb10b442f8c859322d19d1e6
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:15:10 2008 +1000
radeon: fix bug in scratch retreival
-commit 8e1b7e23a041876764118973b7c25e947e98ecd1
+commit 5aa883c562c4957f118f1a9a8f315318dd441c4b
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:14:38 2008 +1000
radeon: add GTT domain
-commit c499bbc453d836f9197873d12a0b1fc9f4c2e2be
+commit 3b9bc914a5669e88f777ec67c8aab4f4ef516555
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 5ae4d04ed95a610bb3617b5f8c20670cfe7f69a2
+commit 068d8610d75ca1dd51a5357c57f9e44c467fdfcc
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 14:28:43 2008 +1000
@@ -553,37 +607,37 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit d268580489ff0ab3c79d3d33b4d32a5439ecc7f1
+commit ce87b0b16a1942e1f46e8ec7f6d7b9fd433665e2
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:14:56 2008 +1000
disable modeset on < r300
-commit 5693ae48d4bd4b17c0185ea87816341335e76c90
+commit 2e16227e49310728d559539eb55a473293b48c6f
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 3d8068cc6c6244df1d8ea0a7b88b62a0bb68e74d
+commit 413ae7631295d5789be28074cd43473473b3d170
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:35:55 2008 +1000
radeon: fix LVDS modes problem
-commit 2ce176a915278a524e1f7e551dbaf6a26b74b330
+commit 9ad80d09ab884b85986173ae1ce967db023cb23e
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 3eb58ca559b1f24b59665f6a4668c9ff9708ce95
+commit 0479b05b4bc8c248ba891d6abc2e8fd689225192
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 bf3a8eb9b7adf7274d90c626383301f6b65dae9b
+commit 377e50cc54b1d1c7aac51a458b8efeddad61558e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 15:23:51 2008 +1000
@@ -591,7 +645,7 @@
Need to add to Intel when we get there
-commit b230e7510e00af081ee0825e09c6bebb22f807ec
+commit e3e62ff1eed2d20a87fcb00cbebb2ee4d77e9dcd
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:38:27 2008 +1000
@@ -599,31 +653,31 @@
This gets RN50 to initialise correctly
-commit fc67418d750520633ea0912eb6fca52824dbee04
+commit a9e1202e6ff248450255991f3d8db868d8c06e75
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:37:25 2008 +1000
radeon: add copy/solid regs for rn50
-commit 0b83ee737025a250c55e556cdaa4692a13acc17a
+commit 6198faacdb60c5e68816af1d1ef78c7d17568b3a
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 892320a5225e16b75e47d00df7bbcdd1aa6e9fe6
+commit d3898ae8a2f02b59e099d353ff8c1f8c4ede509a
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 09:59:31 2008 +1000
radeon: add quirks from DDX
-commit e820c4f19702c9bc2bbf66e39644daf7989fa522
+commit ca5186b0066b743a9d5d9652546fec87c63e53ed
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:12 2008 +1000
radeon: fix warnings
-commit e1f83ac3df7aa1ddfda7d2212ba4c24cf409f629
+commit 2200ec7492fe38ee5d55c3de4d6822f1758e6387
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:47 2008 +1000
@@ -634,31 +688,31 @@
- add debugging for tracing calls
- fix pitch calculation
-commit b9f78a96d0a473871edad1ae5fe4153873e10c80
+commit 9f34f32cc625df9a7b1d04d622e2a9bf4634c0ca
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 1a7da8c4728fad88a8080c375650acee1826be15
+commit ce420424acfcc269d155575a788853bfc9b64c4a
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 5ede8747082de70cea79f11438ed6b39f2311c75
+commit 45b693fce9c128e3546c0561b3e92152644ec524
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 6e650730e3693f2ccce754a9d94f838744f3e830
+commit 82ab51d35b528d192d4849408eae96ec27b7c49d
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:53:08 2008 +1000
radeon/atom: implement crtc lock
-commit 010cd690734a751a2be8ec581ec5b0680776e27f
+commit 739017060c49e249578e7a196607e70a3093c3ee
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:50:15 2008 +1000
@@ -667,7 +721,7 @@
- Add gamma set for legacy chips
- Add 16 bpp gamma set
-commit f86bf2fb0a79c821aec27266b7a20811479f5f0c
+commit 47274596eec13b201214501c94df31860927f41f
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:55 2008 +1000
@@ -677,19 +731,19 @@
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
-commit 4d12261ce0ae6af172de3ce04605d043d61d9442
+commit 0081281d06ece45b6591970f27c18f6a9dbdf6c9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:30 2008 +1000
radeon: Add legacy dac detect stubs
-commit efe875873efca913fbf3205f8f51093a077b8454
+commit 1ef6559300499c3aeb1435c361c0fa66edb95f53
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 891001573f9f852cb8bb579a8bee0509d28f2679
+commit e03c2ca3748d999b3848d23b12eddd23caa3db29
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:48:50 2008 +1000
@@ -697,25 +751,25 @@
- removed save/init/restore chain with set functions
-commit d57041976e276121980a6133065c2d7aad948271
+commit 267ec768bf74f6fc1ad8b58fa22fa61a3b418abb
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:54:04 2008 +1000
FEDORA: radeon set gart buffers start
-commit 749fd155f0db209e86e2b5291cb21123ad33eecd
+commit 123bab87a1d6b97bda3ea1d1132450fdad1df026
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:52:41 2008 +1000
radeon: command submission remove debug
-commit d78dcdbaba9b170b2978f552fa2c9024203a54fb
+commit fea8ab9158b5c0f5b7107649a419354cabf43a60
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 37928a28fc3118c353a2fa36f546bac4c9f3adc1
+commit 09bc5deacb9ea443ecb9842817e2e8a0a086da59
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:19:05 2008 +1000
@@ -723,19 +777,19 @@
in the correct place in the drm so buffer swaps work again
-commit 1ba35152d95c1d6aefb2a7afab191dff166f989e
+commit efd948a4940bd4ae4682beb38687abd4b6ed95b1
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:18:08 2008 +1000
radeon: add mm supported call for userspace
-commit 9403f4d53c5ac181a63108f15ebb958a0cfc0a89
+commit 87af1322671473ab1aa8590f79fafafeb1f89c2d
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 521f1c2264c3de1f3f3c66127d640866eabe8ff2
+commit 6d29e0f718f6459092d3a62cfeb3d9539f19e52d
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 15:57:10 2008 +1000
@@ -744,7 +798,7 @@
This adds the CRTC and PLL setting code, it doesn't work
yet but its all heading in the right direction.
-commit 8b121bdb473bc1cfaea71397d8770958857e51ee
+commit faa98ebf4ab12a667e245bc338581a6961e304ed
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 13:32:50 2008 +1000
@@ -753,67 +807,67 @@
In theory we should be setting the mapping for the legacy node.
the inode for the control node might be different.
-commit 2ed8917602368f90c63669f9ffba0f1627e7e7a3
+commit 906715262089218926234d07d8a00af5493327bd
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 8dc06afeedfc1f836a0ca9eda736fe336837093b
+commit cd8ab0f00d59a0d347da7972963ced1775e0dc98
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 16:01:22 2008 +1000
radeon: set new memmap on gem enable
-commit 614d761bf0fb543d87cbfdbf666266efdf821e72
+commit 91ff162467d88f359333ce47d9187d6c180a8acd
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 56d285ec146aaeca2634de01d77a2e77be3c2508
+commit 2f0ab81927349c06e7a8085924daf558205d63b6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:38 2008 +1000
radeon: set gart table size
-commit 253456a1d0f7b4e6ab773dadc318628bcd2de44f
+commit 83381ea3784cef219dd95142cb792088977eeb4f
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:18 2008 +1000
radeon: fix buffer evict slection
-commit 9aef9a9c1ccd81cda9914c3a33247ad749d08ca7
+commit 471a349ecee8f18b1e9ffce5d09e875297e61e75
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 d1c68a77ad42a55afb889391969cba0f4cd51914
+commit 6890310c3ddaaefd45b9771b68502b24cb194819
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 d8a8547521ba7bbad542e9b4b76b343751547f5e
+commit b1fd5f04041cf04ee6fe2b40416d1d8cf38a1f3a
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 5 11:22:24 2008 +1000
radeon: fix defines so blit works again
-commit 86888f0e7b88dd7461451e21866e1cd49664bfce
+commit 34df37fafe1d3d6cf1d3a4633318c0ba622bb7a1
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 aee576bb4e031debc0589a8a5605d43aafdeac9a
+commit b68c528a0fbf6586632f512a9451970eacf4e151
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:21:22 2008 +1000
drm: fix unneeded debug
-commit 4521e258e1b1c8249c98b156afec5407a80df16d
+commit ab5ec9948a306225a47a2fa788cbd58e1a9e9711
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:47 2008 +1000
@@ -821,49 +875,49 @@
if kms enabled memory manager will be enabled by default
-commit 4b84f451d0a1ceffcb77ce0fb8d3a1d7dab4af5f
+commit b16acad43a87b4c29df48d8a4de0de8a56021eae
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:26 2008 +1000
drm: kill bo after driver lastclose
-commit 292ca306a40567ec99237fccecf16c174573c43f
+commit 2717b94b7d0aa64b099c43feb9e26a9e4458b144
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 276f6499545c2f026458b9a2cad12fb9b11108fa
+commit 9ccb11714a4b76c8214372245db1f7106885bb55
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Aug 2 08:06:26 2008 +1000
drm: fix release locking
-commit e9729544d32c733b86a4232e59867c72e820165b
+commit bbd1e9b351a8d533b580d4c3ff76448d21dcafbf
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 23:39:24 2008 +1000
fix build on powerpc
-commit 66d51eb4b3037387082165d5ac0fa4a1b54ebe1a
+commit e23e6a32a76c91034656eab792a0c7aa9d6f69a4
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 16:55:34 2008 +1000
drm: add radeon modesetting support
-commit 3262d73a01c8975ae6e3031766c899cf1c4b13ac
+commit ee520d0d9e84690e1a29d9d9ca1637c40be2b9b0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:07:35 2008 +1000
drm: add modesetting support
-commit 840ecae073fbd4c22995742dfff58ba281ea84f1
+commit d8227ecf140e0bccb22b7766a3eaaf54290a04db
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:06:12 2008 +1000
drm: add TTM VM changes
-commit 8018b3c4ee3f6a7c6264536fdb0a89dd57d67921
+commit fdc5b1c9ec654febadc052b8aaf6b01e456aee90
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:24:36 2008 +1000
@@ -871,13 +925,13 @@
This adds the control device nodes also
-commit 2623d598ff8ca831ff51464a0c3070d694c98aaa
+commit faf57e51d3ab57131754ca39ef6fdd6e98e60186
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:11:06 2008 +1000
drm: add set/drop master ioctls
-commit 5aa16576424b1712e5288213a2452a5e54dc3acd
+commit 2b8d4a4e4fd3082916cde6d49f45dc950fa9b286
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:57 2008 +1000
@@ -887,19 +941,19 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit bc1d9827831ecb4559c33b2925c6f2bb1def969a
+commit ef6ba84da7f39837011163528406135c839050a4
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:40 2008 +1000
drm: make sarea_max unsigned long
-commit ef789a058650e8a595ad256dd660603d611e8082
+commit d72aa35adfd1ace7bbfd47c33b47c324ccdd3533
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jul 31 15:27:27 2008 +1000
drm: import TTM basic objects
-commit 4044cbad84f2d9eba566fe71c1624cdc1138c2cb
+commit 01f92d010ef52620fa93c5b6157d412821f7ad65
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -910,7 +964,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 12264a8abf613159f1ba3c18abaf47a36c77c560
+commit 646fbbb83a2158104df22eca2b20ca42f9656dd7
Author: Matthew Wilcox <matthew at wil.cx>
Date: Tue Jul 22 08:52:16 2008 -0400
@@ -922,7 +976,7 @@
Signed-off-by: Matthew Wilcox <willy at linux.intel.com>
-commit 9921c8345a4f18380241136b44c14f12c5ba1ff6
+commit 63acbbccc716a2bd701d5a8cbfd88fec63882834
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 12:29:38 2008 -0700
@@ -937,7 +991,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 851a2b1611a7a89b80b75c109869379e368d736d
+commit ebc8c5db063c5d5c225b873f6d40914875ca9e18
Author: David Howells <dhowells at redhat.com>
Date: Wed Jul 30 12:29:37 2008 -0700
@@ -953,7 +1007,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit dcec8e698306440a97ec511fdfe5f521ae459951
+commit 28ea428063cb6eaaa373fd140014fbeddcfed6f8
Author: Carlos R. Mafra <crmafra2 at gmail.com>
Date: Wed Jul 30 12:29:37 2008 -0700
@@ -966,7 +1020,7 @@
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 517a65f273bbb4c3b6825e36f85a04790c212e3f
+commit b513cca4ba0dd9e573428c4903b312910bffd5bb
Author: Eric Anholt <eric at anholt.net>
Date: Mon Sep 15 13:13:34 2008 -0700
@@ -974,19 +1028,19 @@
Fixes bad software fallback rendering in Mesa in dual-channel configurations.
-commit e5e3c1aa776d38cf6a67177a4e60553484f6bf51
+commit 297f3fabd7ed9ee97cd450148bf0bf642529de29
Author: Eric Anholt <eric at anholt.net>
Date: Wed Sep 10 14:22:49 2008 -0700
drm: Avoid oops in GEM execbuffers with bad arguments.
-commit 40e6b1e280a0775a12f6cf990ea79836554cfdab
+commit b279a01b2a75eb97ed27695af96963c75cdec280
Author: Eric Anholt <eric at anholt.net>
Date: Tue Sep 9 11:40:34 2008 -0700
DRM: Return -EBADF on bad object in flink, and return curent name if it exists.
-commit 9832492a3ca5d7b515a2a8902301e750189e11a0
+commit d0a926529817b70618cb872cb5fc6682b9fe420d
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:04:27 2008 -0400
@@ -995,7 +1049,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 9d1f3e70f98520651b4a6c284df96854b236a74b
+commit edbaf566a455f354c599344b2bd489e36e4b7990
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:20:13 2008 -0400
@@ -1006,7 +1060,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit b733f41ab803a4a5d988498b7466295fa4752a55
+commit bed8e0bb4332f1d9b1a90250e0821209d2d9c262
Author: Eric Anholt <eric at anholt.net>
Date: Mon Sep 1 16:45:29 2008 -0700
@@ -1020,7 +1074,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 6d883f4cb21eb7f5e3b8555d075c08918d5f6a32
+commit 9d2238cddb3eec2ed07eca1ca7d16bd30d0bd5a3
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:08:52 2008 -0400
@@ -1029,7 +1083,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit a6b7a6f4b75d36e13b7165edc15128c6c17df19a
+commit 35263d914d240087841bebfd284026c7cf34c2ef
Author: Eric Anholt <eric at anholt.net>
Date: Wed Jul 30 12:06:12 2008 -0700
@@ -1048,7 +1102,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit e3597b80a7164ce4f4b7f87b2b064bf6702e80fd
+commit 1d2af7e18be9aec8bdc681301fa76c2ad72bab5c
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 21 12:53:33 2008 -0700
@@ -1060,7 +1114,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 32bbf73c90f92b59a69691fe84f2af600e18e0f0
+commit 5af054662755e3a00d6b392565337d50014c18d8
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -1073,7 +1127,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 3a10873be10d011992ce15a809c533c828e6d205
+commit 86bc0df80cfcd1e54ac2c9fcc7b7640a72995565
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Tue Aug 5 19:37:25 2008 +0100
@@ -1086,7 +1140,7 @@
Signed-off-by: Matthew Garrett <mjg at redhat.com>
Signed-off-by: Dave Airlie <airlied at linux.ie>
-commit ce7433c978a38e743078e59db316e9956b32f02a
+commit c8251bc5073bb65190ddf55ea98bc255288af37a
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 13:03:43 2008 -0700
@@ -1097,7 +1151,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit bc90e4d5e5ffab0882712a4d66dcccbf6e0cc874
+commit 475546e33378c17075a952efea3da8b065848ba5
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:21:20 2008 -0700
@@ -1107,7 +1161,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 22b314e90260a66d4431a7adb856e82a66c84426
+commit d0fea1a168f7e9320a1b3fe9c0dd573779bea980
Author: Eric Anholt <eric at anholt.net>
Date: Tue Jul 29 12:10:39 2008 -0700
@@ -1121,7 +1175,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 23314b834cc22ebd5dfb4c36f526995270994b50
+commit 2ec2d779f22c1bbabf9af479d7855ecd452f7207
Author: Jesse Barnes <jbarnes at virtuousgeek.org>
Date: Tue Jul 29 11:54:06 2008 -0700
@@ -1129,7 +1183,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit d8f1b3ff1a92fd45a07dee71776250d9f5968a70
+commit 141f51101038d98f1b62159c0ef5e280800815af
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:36:08 2008 -0700
@@ -1139,7 +1193,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit a469fa6430ef68501bc0371d9795f5ce90e09cc5
+commit 260eb9bf8df4e48fb4e0c4adb2720dbe5b99558b
Author: Keith Packard <keithp at keithp.com>
Date: Wed Jul 30 12:28:47 2008 -0700
@@ -1889,10 +1943,10 @@
return -EINVAL;
diff --git a/drivers/gpu/drm/drm_bo.c b/drivers/gpu/drm/drm_bo.c
new file mode 100644
-index 0000000..7ee69f0
+index 0000000..5cec5a0
--- /dev/null
+++ b/drivers/gpu/drm/drm_bo.c
-@@ -0,0 +1,2110 @@
+@@ -0,0 +1,2116 @@
+/**************************************************************************
+ *
+ * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -3969,22 +4023,28 @@
+ struct list_head *lru;
+ int ret;
+ /* evict all buffers on the LRU - won't evict pinned buffers */
-+
++
+ mutex_lock(&dev->struct_mutex);
+ do {
+ lru = &man->lru;
+
-+ if (lru->next == lru) {
++redo:
++ if (lru->next == &man->lru) {
+ DRM_ERROR("lru empty\n");
+ break;
+ }
+
+ entry = list_entry(lru->next, struct drm_buffer_object, lru);
++
++ if (entry->mem.flags & DRM_BO_FLAG_DISCARDABLE) {
++ lru = lru->next;
++ goto redo;
++ }
++
+ atomic_inc(&entry->usage);
+ mutex_unlock(&dev->struct_mutex);
+ mutex_lock(&entry->mutex);
+
-+ DRM_ERROR("Evicting %p %d\n", entry, entry->num_pages);
+ ret = drm_bo_evict(entry, mem_type, no_wait);
+ mutex_unlock(&entry->mutex);
+
@@ -3997,7 +4057,7 @@
+ drm_bo_usage_deref_unlocked(&entry);
+
+ mutex_lock(&dev->struct_mutex);
-+ } while(0);
++ } while(1);
+
+ mutex_unlock(&dev->struct_mutex);
+
@@ -29096,10 +29156,10 @@
+}
diff --git a/drivers/gpu/drm/radeon/radeon_buffer.c b/drivers/gpu/drm/radeon/radeon_buffer.c
new file mode 100644
-index 0000000..fe2aa6f
+index 0000000..e5a9089
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_buffer.c
-@@ -0,0 +1,441 @@
+@@ -0,0 +1,448 @@
+/**************************************************************************
+ *
+ * Copyright 2007 Dave Airlie
@@ -29408,22 +29468,32 @@
+ int ret;
+
+ tmp_mem = *new_mem;
-+ tmp_mem.mm_node = NULL;
-+ tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT;
+
-+ ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
-+ if (ret)
-+ return ret;
++ /* if we are flipping into LOCAL memory we have no TTM so create one */
++ if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
++ tmp_mem.mm_node = NULL;
++ tmp_mem.proposed_flags = DRM_BO_FLAG_MEM_TT;
+
-+ ret = drm_ttm_bind(bo->ttm, &tmp_mem);
-+ if (ret)
-+ goto out_cleanup;
++ ret = drm_bo_mem_space(bo, &tmp_mem, no_wait);
++ if (ret)
++ return ret;
++
++ ret = drm_ttm_bind(bo->ttm, &tmp_mem);
++ if (ret)
++ goto out_cleanup;
++ }
+
+ ret = radeon_move_blit(bo, 1, no_wait, &tmp_mem, &bo->mem);
+ if (ret)
+ goto out_cleanup;
+
-+ ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
++ if (new_mem->mem_type == DRM_BO_MEM_LOCAL) {
++ ret = drm_bo_move_ttm(bo, evict, no_wait, new_mem);
++ } else {
++ tmp_mem.mm_node = NULL;
++ new_mem->mm_node = NULL;
++ }
++
+out_cleanup:
+ if (tmp_mem.mm_node) {
+ mutex_lock(&dev->struct_mutex);
@@ -29503,9 +29573,6 @@
+ return 0;
+ }
+
-+ /* disable these blit moves for now that appear to be failing */
-+ goto fallback;
-+
+ if (new_mem->mem_type == DRM_BO_MEM_VRAM) {
+ if (radeon_move_vram(bo, evict, no_wait, new_mem))
+ goto fallback;
@@ -29538,7 +29605,7 @@
+ case DRM_BO_MEM_TT:
+ return DRM_BO_FLAG_MEM_LOCAL;
+ default:
-+ return DRM_BO_FLAG_MEM_TT;
++ return DRM_BO_FLAG_MEM_TT | DRM_BO_FLAG_MEM_LOCAL;
+ }
+}
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c
@@ -34425,7 +34492,7 @@
}
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
-index 0993816..0ee493e 100644
+index 0993816..a45e7f2 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -34,6 +34,8 @@
@@ -35115,7 +35182,7 @@
+int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+struct drm_gem_object *radeon_gem_object_alloc(struct drm_device *dev, int size, int alignment,
-+ int initial_domain);
++ int initial_domain, bool discardable);
+int radeon_modeset_init(struct drm_device *dev);
+void radeon_modeset_cleanup(struct drm_device *dev);
+extern u32 radeon_read_mc_reg(drm_radeon_private_t *dev_priv, int addr);
@@ -36256,7 +36323,7 @@
+}
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
new file mode 100644
-index 0000000..3d1e4ea
+index 0000000..ea2f39d
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -0,0 +1,921 @@
@@ -36750,7 +36817,7 @@
+ size = mode_cmd.pitch * mode_cmd.height;
+ aligned_size = ALIGN(size, PAGE_SIZE);
+
-+ fbo = radeon_gem_object_alloc(dev, aligned_size, 1, RADEON_GEM_DOMAIN_VRAM);
++ fbo = radeon_gem_object_alloc(dev, aligned_size, 1, RADEON_GEM_DOMAIN_VRAM, 0);
+ if (!fbo) {
+ printk(KERN_ERR "failed to allocate framebuffer\n");
+ ret = -ENOMEM;
@@ -37288,10 +37355,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..225f026
+index 0000000..5e2ad98
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
-@@ -0,0 +1,1608 @@
+@@ -0,0 +1,1611 @@
+/*
+ * Copyright 2008 Red Hat Inc.
+ *
@@ -37368,7 +37435,7 @@
+}
+
+struct drm_gem_object *radeon_gem_object_alloc(struct drm_device *dev, int size, int alignment,
-+ int initial_domain)
++ int initial_domain, bool discardable)
+{
+ struct drm_gem_object *obj;
+ struct drm_radeon_gem_object *obj_priv;
@@ -37391,6 +37458,9 @@
+
+ flags |= DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_EXE;
+
++ if (discardable)
++ flags |= DRM_BO_FLAG_DISCARDABLE;
++
+ if (alignment == 0)
+ alignment = PAGE_SIZE;
+
@@ -37423,7 +37493,7 @@
+ /* create a gem object to contain this object in */
+ args->size = roundup(args->size, PAGE_SIZE);
+
-+ obj = radeon_gem_object_alloc(dev, args->size, args->alignment, args->initial_domain);
++ obj = radeon_gem_object_alloc(dev, args->size, args->alignment, args->initial_domain, args->no_backing_store);
+ if (!obj)
+ return -EINVAL;
+
@@ -41981,10 +42051,10 @@
+#endif
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
new file mode 100644
-index 0000000..6b53c60
+index 0000000..9e119c0
--- /dev/null
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
-@@ -0,0 +1,241 @@
+@@ -0,0 +1,245 @@
+/*
+ * Copyright 2007-8 Advanced Micro Devices, Inc.
+ * Copyright 2008 Red Hat Inc.
@@ -42050,16 +42120,16 @@
+ if (!(dev_priv->flags & RADEON_IS_IGP))
+ drm_bo_evict_mm(dev, DRM_BO_MEM_VRAM, 0);
+
-+ if (dev_priv->flags & RADEON_IS_PCIE) {
-+ memcpy_fromio(dev_priv->mm.pcie_table_backup, dev_priv->mm.pcie_table.kmap.virtual, RADEON_PCIGART_TABLE_SIZE);
-+ }
-+
+ dev_priv->pmregs.crtc_ext_cntl = RADEON_READ(RADEON_CRTC_EXT_CNTL);
+ for (i = 0; i < 8; i++)
+ dev_priv->pmregs.bios_scratch[i] = RADEON_READ(RADEON_BIOS_0_SCRATCH + (i * 4));
+
+ radeon_modeset_cp_suspend(dev);
+
++ if (dev_priv->flags & RADEON_IS_PCIE) {
++ memcpy_fromio(dev_priv->mm.pcie_table_backup, dev_priv->mm.pcie_table.kmap.virtual, RADEON_PCIGART_TABLE_SIZE);
++ }
++
+ pci_save_state(dev->pdev);
+
+ if (state.event == PM_EVENT_SUSPEND) {
@@ -42084,12 +42154,14 @@
+ pci_restore_state(dev->pdev);
+ if (pci_enable_device(dev->pdev))
+ return -1;
-+ pci_set_master(dev->pdev);
+
-+ /* Turn on bus mastering */
-+ tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
-+ RADEON_WRITE(RADEON_BUS_CNTL, tmp);
++ /* Turn on bus mastering -todo fix properly */
++ if (dev_priv->chip_family < CHIP_RV380) {
++ tmp = RADEON_READ(RADEON_BUS_CNTL) & ~RADEON_BUS_MASTER_DIS;
++ RADEON_WRITE(RADEON_BUS_CNTL, tmp);
++ }
+
++ DRM_ERROR("\n");
+ /* on atom cards re init the whole card
+ and set the modes again */
+
@@ -42100,6 +42172,8 @@
+ radeon_combios_asic_init(dev);
+ }
+
++ pci_set_master(dev->pdev);
++
+ for (i = 0; i < 8; i++)
+ RADEON_WRITE(RADEON_BIOS_0_SCRATCH + (i * 4), dev_priv->pmregs.bios_scratch[i]);
+
@@ -42147,7 +42221,7 @@
+ master_priv->sarea_priv->ctx_owner = 0;
+ }
+
-+ /* unpin the front buffers */
++ /* pin the front buffers */
+ list_for_each_entry(fb, &dev->mode_config.fb_kernel_list, filp_head) {
+
+ struct radeon_framebuffer *radeon_fb = to_radeon_framebuffer(fb);
@@ -50387,10 +50461,10 @@
+#endif
diff --git a/include/drm/drm_objects.h b/include/drm/drm_objects.h
new file mode 100644
-index 0000000..fa9fd96
+index 0000000..cdd8236
--- /dev/null
+++ b/include/drm/drm_objects.h
-@@ -0,0 +1,894 @@
+@@ -0,0 +1,900 @@
+/**************************************************************************
+ *
+ * Copyright (c) 2006-2007 Tungsten Graphics, Inc., Cedar Park, TX., USA
@@ -50510,6 +50584,12 @@
+ */
+#define DRM_BO_FLAG_NO_MOVE (1ULL << 8)
+
++/*
++ * Mask: if set the note the buffer contents are discardable
++ * Flags: if set the buffer contents are discardable on migration
++ */
++#define DRM_BO_FLAG_DISCARDABLE (1ULL << 9)
++
+/* Mask: Make sure the buffer is in cached memory when mapped. In conjunction
+ * with DRM_BO_FLAG_CACHED it also allows the buffer to be bound into the GART
+ * with unsnooped PTEs instead of snooped, by using chipset-specific cache
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1024
retrieving revision 1.1025
diff -u -r1.1024 -r1.1025
--- kernel.spec 8 Oct 2008 00:39:43 -0000 1.1024
+++ kernel.spec 8 Oct 2008 07:04:28 -0000 1.1025
@@ -1792,6 +1792,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Wed Oct 08 2008 Dave Airlie <airlied at redhat.com>
+- radeon - hopefully fix suspend/resume - reenable HW migration
+
* Tue Oct 07 2008 Dave Jones <davej at redhat.com>
- 2.6.27-rc9-git1
- Previous message (by thread): rpms/libchewing/F-9 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 libchewing.spec, 1.18, 1.19 sources, 1.4, 1.5
- Next message (by thread): rpms/libchewing/F-8 .cvsignore, 1.4, 1.5 import.log, 1.1, 1.2 libchewing.spec, 1.16, 1.17 sources, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list