rpms/kernel/F-10 drm-next-intel-irq-test.patch, NONE, 1.1 drm-modesetting-radeon.patch, 1.59, 1.60 drm-next.patch, 1.7, 1.8 kernel.spec, 1.1151, 1.1152
Dave Airlie
airlied at fedoraproject.org
Tue Nov 18 07:09:48 UTC 2008
- Previous message: rpms/iproute/F-8 iproute-2.6.26-ip-abbreviation.patch, NONE, 1.1 iproute.spec, 1.72, 1.73
- Next message: rpms/gnome-power-manager/devel gpm-use-sm-dbus-rather-than-libgnome.patch, NONE, 1.1 .cvsignore, 1.50, 1.51 gnome-power-manager.spec, 1.134, 1.135 sources, 1.50, 1.51 default-privs.patch, 1.1, NONE gpm-fix-buttons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: airlied
Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv470
Modified Files:
drm-modesetting-radeon.patch drm-next.patch kernel.spec
Added Files:
drm-next-intel-irq-test.patch
Log Message:
- rebase to intel proper set of patches + test patch fix.
drm-next-intel-irq-test.patch:
--- NEW FILE drm-next-intel-irq-test.patch ---
This patch skips the loop in the irq handler in non-MSI mode, with the
thought that we never had IRQ floods before it was added. I've tested
for 'a while' on my GM965 and haven't seen any problems, but I hadn't
run the looping code before.
If you're getting IRQs disabled, please give this a try and report back.
=46rom 29165ca636b4703046f1290c489885f1f3c41420 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp at keithp.com>
Date: Mon, 17 Nov 2008 21:32:29 -0800
Subject: [PATCH] [drm/i915] Don't loop in i915 irq_handler in non-MSI mode
Fixing MSI interrupts required looping in the IRQ handler until IIR went to
zero (otherwise we'd lose interrupts). This isn't required in non-MSI mode
as the IRQ will be re-raised on exit, and if we try this, it appears to mak=
e
some machines generate an endless stream of interrupt requests while IIR is
zero. The kernel eventually disables the interrupt and things stop working.
Signed-off-by: Keith Packard <keithp at keithp.com>
---
drivers/gpu/drm/i915/i915_irq.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 654d42f..b7e1a04 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -244,7 +244,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
* stray interrupts.
*/
iir = new_iir;
- } while (iir != 0);
+ } while (iir != 0 && dev->pdev->msi_enabled);
return IRQ_HANDLED;
}
drm-modesetting-radeon.patch:
Index: drm-modesetting-radeon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-modesetting-radeon.patch,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- drm-modesetting-radeon.patch 17 Nov 2008 08:32:00 -0000 1.59
+++ drm-modesetting-radeon.patch 18 Nov 2008 07:09:47 -0000 1.60
@@ -1,34 +1,34 @@
-commit edeaa3c729dbd36549313240578ff5237d432b8a
+commit 6f3f61f49573db49b0753246432cabd0ec9874d8
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 18:14:28 2008 +1000
radeon: turn of VRAM zeroing by default for now - needs work
-commit 9cb412b0c26cf9030ff83402e8e3c8a409ba81fe
+commit 8db04f7036da4679b2fabc11e9aba369e53742da
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 16:59:00 2008 +1000
drm: make 800x600 be standard not 640x480
-commit 2b2157aa0f0a959fc4901627083ccf29f08eec53
+commit 9ba7d8764e635fb3970e332a375f5737bf76f66d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:36 2008 +1000
radeon: fix return value for no relocs
-commit 5923ab41edd35d28fc2e2c09a4a19509b1c57446
+commit 8fb7d29572e13fc3c0a656c3bd331b74bc40bd49
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 17 09:03:01 2008 +1000
ttm: add discard for VRAM buffers
-commit 9d4eb07f155cde0648888efb6a4b6e1e4596e786
+commit 0b9bb18f43cbe0530315576779e00f040e009a05
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:52:32 2008 +1000
drm: fix the exit path of the bo unlocking
-commit 6ea5a728bb6081d876e982a6754bd883557b9fa3
+commit be363ffa96a54097b91bf2049a278c520d157fe4
Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
Date: Fri Nov 14 15:51:44 2008 +1000
@@ -36,55 +36,55 @@
Fixup failure paths and make EAGAIN work
-commit a7d881ccf0f7a099ba1b2b38d880df8bddc610a2
+commit 3e942734ecf15667177effd5e541796a279520c3
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Nov 13 17:22:26 2008 +1100
radeon: fix some issues since last rebase
-commit d6568c59bd20f95e9ade0c28018ed0063fda240f
+commit 4b7dbf8bb37888fa45afdd248fc3e54392c9b1f8
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 09:01:14 2008 +1000
radeon: fix more build
-commit 3f90df7abcb0c88dca52b7287f7675f26d8fa34b
+commit 917d96dd4e24490f1222e7187183a789b576fd9e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 08:59:04 2008 +1000
radeon: fix compile
-commit fe3e14dd8da2fd7f4566b32e1e42349089dd9966
+commit 936702e46b302aab564cf3471cec474a415260de
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 08:58:55 2008 +1000
i915: fix master bits
-commit 927c18a7e25921dd80a8c503259017ff44345437
+commit a6b89de74617402f17abdd6cf3e965b938dabe84
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 10 15:39:25 2008 +1000
radeon: fix dumbness in cp ring check
-commit 04db227571a0a71bb2b6e0781a736fcfe7d5d6c1
+commit edf529612b2d47f07e3a62b8a1e7b39f534d9ed5
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 10 14:26:11 2008 +1000
radeon: add gart useable size to report to userspace
-commit 535b93cc86a15d616e03ea1f835fe46ba30dc736
+commit 3a3cace7c9964f62d6a8d89affcffb88a8a6681d
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 9 20:34:49 2008 +1000
radeon: fix powerpc oops on rv280
-commit 2894f0654cbae1f21924978d7616263d372b974e
+commit 71d810605e5aedecc159bc86c1a96e3f673c4d4e
Author: Dave Airlie <airlied at redhat.com>
Date: Sun Nov 9 10:23:43 2008 +1000
radeon: upgrade atom headers
-commit 5e5d4afda733b61984b81c34ca99488b69d80d89
+commit d0115b2129c49138b6ff805c89ccea1d3e1e184f
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Nov 8 14:39:41 2008 +1000
@@ -93,13 +93,13 @@
For some reason reading the SCRATCH reg from RAM causes some race to occur.
Hopefully fix this.
-commit ddbc65e2d9ae672ee47493934d3c73c13a17423b
+commit 9274c5b531772c536ac46af546fbcc7462056e39
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Nov 8 11:31:03 2008 +1000
drm/radeon: add dpms connector functions
-commit 7301aabea9a13ff5fa92c97127581d78e656bb09
+commit aae530859dd2142283f62a2004d5e5ba7d88d0f6
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 7 16:22:22 2008 +1000
@@ -107,13 +107,13 @@
fixes cursor on second head
-commit 06e72c30a166a0786464b2aac26c32533231c666
+commit ad0c84ed7b731fe98ed8d555b9fb02f7f7a669d4
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Nov 7 16:21:03 2008 +1000
modesetting: set the crtc x,y after the mode base change
-commit 2bf8bd4aa80b64dfe2b0a491b8376ed24354ff5f
+commit f24e2e5edfdd6ed2bd79e8ab9f3ca619e9be2754
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 5 10:23:35 2008 +1000
@@ -121,19 +121,19 @@
This allows re-use of uc/wc marked pages
-commit 2c3b398237b44831696f1125655e1f675df3076c
+commit d79264d477fe607ad0067226a75f6e7f441635a3
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 5 10:22:27 2008 +1000
radeon: fix ring tail overflow issue since alignment
-commit d6c0947428be7af618990d7db93b4b1b9403bca7
+commit 2b7f36f5ce3e6b953bcf9f323ee9b787d9ed1200
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Nov 4 13:18:02 2008 +1000
radeon: disable HDP read cache for now
-commit 63527c82f569bf726666716f674f034d826c2e0e
+commit 9633d11a8c504a3a0da36d93ee82c6fadc279f10
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Nov 4 12:02:55 2008 +1000
@@ -141,25 +141,25 @@
Also set the fetch size to what tcore/fglrx uses.
-commit 4a49fb763b2fb3f1f7de8cfa30d34e9a6da22069
+commit 9f1c31cdcac8aea320cf755c18edd2aaa76da25f
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 15:43:08 2008 +1000
radeon: fixup vram visible calculation to take a/c pinned objects for now
-commit ba94d70d0bcbbce6ad16adbc5e811baa00dc31c5
+commit d7a0e695c6d2d0733e0e49588776527fb9869184
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 09:56:02 2008 +1100
radeon: if modesetting state is unknown make it known so pm-utils can use it
-commit 50f5435a1be89f68096d700b3d001f1dab0863be
+commit 4cf9839f1446c3756cdf9b3ae47fc9e0c015a22c
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Oct 31 14:40:12 2008 +1000
radeon: fix ROP values for the paint ROP
-commit 459586927351eb9d8ab93b1ab2b8215b1de3ec43
+commit 94cde5193bc78fa068bff0515889d93880c6cca6
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 14:00:39 2008 +1000
@@ -167,49 +167,49 @@
This speeds things up a bit
-commit 76580a7eed651717f0a6dbf53d1fef3e704382be
+commit e28bf0f618633bf7cc6e512627999b5897b5ebf3
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 14:00:15 2008 +1000
radeon: disable AGP for certain chips if not specified until we figure it out
-commit 184f8908eec6ac94affcee38fb6b66e8da61b122
+commit f90e3a04868a70e7dcac35aef430079633396e5a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:45:47 2008 +1000
radeon: disable debugging message
-commit 5243ebcb7114ba7da8c3f9960333ff4a0a092af3
+commit 35f7a0c6c29694eab135b0077873a776d4cd49f8
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:37:32 2008 +1000
radeon: commit ring after emitting the buffer discards
-commit 215029e167aa076ae79b7de662b10f42c101fe98
+commit 2194de55cae91a13096538451703e6439add8d07
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 17:39:27 2008 +1100
radeon: fix whitespace in encoders C file
-commit 23d61ca8874a750c3aedb606fa98d28af57c8043
+commit acc4bf223c85f5cbc8487ad2b505bafbcdae91c6
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 17:39:08 2008 +1100
radeon: add more HDMI bits
-commit 1e45a4b8124673f072ea2c0b2c2a663370786523
+commit 11f0a8deef3bdd008be67f05cf9225eec81c195c
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 01:41:34 2008 +1000
radeon: set dma bufs bo type to a kernel type
-commit a346f76f8746a0cc478c4adbcf5a05c19b66c0de
+commit 8854dedd7edc1c1991731080d882519ba6029000
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 30 01:05:48 2008 +1000
drm: reorder AGP unloading wrt driver unloading
-commit aac4405547edf7788d005ffce1f8f6a4efcd0588
+commit 944ec6306919b5d1530a6e4491f5fedcea3197d1
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 29 15:46:16 2008 +1100
@@ -217,19 +217,19 @@
This allows the rs690 to work on DVI
-commit 3cdd3ba5b40548183a91852819119dbc2bc7cb21
+commit b2f1c61d68027072e7fd60c4ae874674d4520770
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:33:13 2008 +1000
radeon: setup isync cntl properly
-commit 9483186878d00768eff04a3e8eea8c09b646c2df
+commit 4b270148564f233f2af3c8b76b62511a0c96420e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:31:27 2008 +1000
radeon: add more debugging
-commit c055c200958b019835cc727e03fa50f302404099
+commit 4c17f7865e4b4ef05ee0531f5a42cced5d7bd88d
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 20:26:04 2008 +1000
@@ -237,97 +237,97 @@
emit in 16-dword blocks, emit irqs at same time as everything else
-commit 9428108fcd8f96a5a8a09bddf9c21eabd43e3f72
+commit b5625201ea3736909bc5f774256f1a6faa8c3cc7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:49:09 2008 +1000
radeon: fix race in sysfs
-commit 5607dc511cea0c66e8c422aa6cb0ac8562d5afcb
+commit 5c36f857df8eb4f1da5420997cb768e7e7f7408f
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:46:47 2008 +1000
radeon: add proc debugging for interrupts/ring
-commit 3360e8825e23c0a80b1fd93fd12fc7816bcd2a4f
+commit f577de690630e475458087ee0d73e01f296312d7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 16:44:54 2008 +1000
radeon: only enable dynclks if asked for
-commit 8346c15aa0bb6e47251708752451685966b8a39f
+commit db14a3ad1f96eefa8342869d29986e89763ff169
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 06:35:10 2008 +1000
radeon: add wait rendering API
-commit 94390c9e6525992947543b2454a316dab51ae481
+commit 6165d370068069415a3fb13c03fdcac352d2c8c4
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 28 06:05:58 2008 +1000
radeon: rs480 fixes for bus mastering
-commit a5ee27dfe9f8bd7afb9cc71b17b9fa974e8667c6
+commit e07b1fddb233476b5bb93325d8792a38e3ca39f1
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 18:30:15 2008 +1000
radeon: remove unused gem indirect ioctl
-commit 6f97124a02c3626cb61ef2f1b78cd176f5416414
+commit 1df448c038cbd7db5d81ef0b309543ca0b6c05b7
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:41:09 2008 +1000
radeon: fix some warnings
-commit 03c6df6aee0ec3dd74792095c3a76ba9c8d4c202
+commit 769f01ad0148547803eee2b8f0a74d74c4c6ed2b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:40:34 2008 +1000
radeon: fix free after refcount
-commit edd2450f15a75a9bf2c1b508d9c67c49b6389ca1
+commit d9d1be64efb14d94ded6006c304ad8a0182cfd43
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:40:15 2008 +1000
radeon: CS2 make it all work with new relocs style
-commit 933b7c51a0d2af7ecf1d6acb31ba1c48f01c6eba
+commit 83d2f1276acdbbedbe1ba015bbda7212e08f933d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 16:39:12 2008 +1000
radeon: don't copy to user the cs ids
-commit dcef65486c00e1472fe156d44d8288ed33c95f10
+commit f74c0da433c4c61d0fef28cb7d8ed987efa86f7c
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 14:23:22 2008 +1000
radeon: make new CS2 command submission interface port older interface to this
-commit 2535b4f528c75882fba11553fcc39f00b8a1681d
+commit f6bad6fe57ec0c40fd0bd1c57d499e662e1ab1df
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 27 10:26:03 2008 +1000
radeon/drm: fixup ref counting in on fb objs
-commit f4462cd62e283853ad5d447edf8c7ce12a615748
+commit ab65452db7fc1e07fea78a8bc8125a29c451ca5e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 23 19:13:50 2008 +1000
radeon: release agp on module unload
-commit b9a4670303e0d2dfc24f89d049dc652ae599794d
+commit a15bf28f38bf1522f4bd759bf45b52e53915153e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 21 14:15:23 2008 +1000
radeon: add r423 bits to modesetting
-commit a92b7a67a4ba4af1a4e6c89059790a04815bcf62
+commit e3ee739a73f85c37070015e5f32d0fffc29288d8
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 21 14:12:38 2008 +1000
radeon: pull bus master enable into its own function
-commit 52331868a40273625ab2ae31e6780d2d44baa5ea
+commit 4cecbb0f867b20251f39e6a12dea12b67bf2acab
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 14:44:23 2008 +1000
@@ -336,67 +336,67 @@
We actually were passing accessible to userspace, but I thought
the code sized it correctly, however it doesn't seem to.
-commit 94692d71aa8c6ecc26910437c3edc42d24c6cb7e
+commit 02d7c4fd026abba90ff45e6db22cb030508822db
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 13:41:05 2008 +1000
radeon: update proper chip family
-commit ccd9746f3dd4fa1cde629ed7af16bd911f1b7e25
+commit 78e0e2263afa9dbb9696dfa19249786760c5aa87
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 12:08:50 2008 +1000
radeon: fixup scratch register interactions properly
-commit 52a8a5890d9779b5d43e50a173843341e5b0a73d
+commit e61942e51acd95e4a316a250c2770f2cc73be9a0
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 10:27:50 2008 +1000
radeon: make writeback work again
-commit d3e6a1ccdf8190cc8bac85315b71d8a3ea237bc7
+commit 54e981d253960025def75759ae0a9c7c5ce1905b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 20 09:20:23 2008 +1000
drm: cleanup some warnings
-commit 7f605479ca27655593bd7859bc7ae32485d67840
+commit 399715e24dc375760808b6c1f270ff8fb6f8eeb2
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 16:29:08 2008 +1000
radeon: fix small typo in agp code
-commit 221d35a64b90443d34053d837d9e9ff60ac327a3
+commit 7c5c04a7efb302666612f135b8ea3f820722a466
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Oct 16 16:17:01 2008 +1000
radeon: workaround failure to parse some rs48x edid
-commit 267aae9c7fe74aec8e71dec8c18c5238a795a50d
+commit 42a70f19657bbd5c7d37686157a066b8ba85e3ea
Author: Dave Airlie <airlied at panoply-rh.(none)>
Date: Thu Oct 16 16:15:08 2008 +1000
radeon: don't enable dynclks on rs48x
-commit 954e8d1450b397a0eca7da3ea4e2920eecacf9d2
+commit bcdfb6e5b273f97a473d714ff0efe3dfd50ba75a
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 15 15:12:20 2008 +1000
radeon: allow r100/r200 modesetting to be forced on by users
-commit ef367e4bb45565cb9326dfdb4497027ee5357cf4
+commit 50e57686a1f9338ec7dc5328b46bf6e7681c6490
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 22:06:00 2008 +1000
radeon: fix unused agp functionality
-commit c540a49adfb58be957c6352bb3bc961241c91d32
+commit 60cb0447a9c4ef7175f961bf3cb2d6e573e1f88f
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 16 22:05:02 2008 +1000
radeon: add some more r100 support to test AGP
-commit 5f01ff6b1905275e60e757a98ff4df658cc25116
+commit 02591c222a9cb14b0336843c065bf6a879f5092e
Author: airlied <airlied at redhat.com>
Date: Wed Oct 15 23:58:03 2008 +1000
@@ -404,55 +404,55 @@
This add agpmode command line option.
-commit 0cd0b0a56cb0cc11910e0f14b12d8746a586c2fe
+commit cedb1dc9dcfb3ec08a06123f9501b7e1f6664a7d
Author: airlied <airlied at redhat.com>
Date: Wed Oct 15 23:57:21 2008 +1000
radeon: add CS support for r100/r200 in 2D driver
-commit 7a971567e26b556c5ece67bf87e1a20a271a12a4
+commit ea3ebbf13c7999135ee24451f9317ed4f13975d4
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Oct 9 16:37:23 2008 +1100
radeon: fixup interrupt suspend/resume
-commit ef690a48f8574d54e788dafa9b0e0edde8356282
+commit e7f94b71840a3c3a65e1055f8e45399473ff7247
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:57:12 2008 +1000
radeon: fixup suspend/resume bus master enable
-commit 53f1c0037545ba24be003f695f076a67180af598
+commit 76e1eb72513228baf0a21a62d0fd071d6392f944
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 465a1e2116185f221ce1e2807ece5898d1d6638a
+commit adefa116dfb5798ff2c232a0385f8e38962caf8e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 8 16:53:43 2008 +1000
radeon: fix buffer copying for VRAM->TT
-commit 0a3b1a2134b93904ee76651d3396c9f266bec8c6
+commit 78500627220079052fd8acb02bd5cb1141af0675
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 442d6610f1b7403c47f21842aa20a0e372177e8d
+commit fac4ceded4defd17289852a70cc565dac90d8c50
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:34:12 2008 +1000
drm: remove stray debug code
-commit 72004549d0ed3c167c22510c0d75f9928a33e0b7
+commit ab873e3401e2b4095fda4d0059c0d3776129e727
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 2aa4676d07f3b3cf31f8e1a20f190ecb339a4aa0
+commit 079911980c56a42fe301bbfff372201e27c0d71d
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:30:09 2008 +1000
@@ -461,7 +461,7 @@
This discards memory contents on suspend/resume with the
hope the upper layers know something we don't.
-commit 27e42a2eb37ea747e62d05fc0cec7fb9c3bd9d12
+commit cc265f97c7679aa9825ba01206d5900f0d52142d
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Oct 7 16:27:31 2008 +1000
@@ -470,7 +470,7 @@
This enables the evict code and also sets radeon up
to allow evict from VRAM to LOCAL
-commit da3fa2aa492458cb567f033b02fec4ab988423bf
+commit 4cecfa97d5e5a531fb0b82391a2f7b35adb61d14
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Oct 6 16:20:38 2008 +1000
@@ -478,31 +478,31 @@
fixup the interface between gem and ttm for alignment. makes Xv work better
-commit 9ac157112cebc658937c924304ece26fe6c89ae8
+commit 628033b1959eeaf4af9364b6aba42d82c58d9a45
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 31b14dcf822149ca8333d217e056ff339ffc76e7
+commit a3f71509ebb461aa4f1c6286ff1778a5efea037b
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 790ba2cee9cf8c591554bd3a9ffa71ddb1ed2545
+commit 144f3533fab2f1ed7418c58c51afe4c0ed44fbef
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Oct 1 11:25:54 2008 +1000
drm: fixup clean flag handling properly
-commit ae05f1c9c3d6301258aeb82aa7d1ba5d7aefe41d
+commit fdf064c793efd509248324dc4837b4336257f06a
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 e16eefcb213996211c64b9997fb3727d636e6f67
+commit 97bb959778de3332a6b99c2fe10ad00bab4d1c37
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Mon Sep 29 14:56:32 2008 +1000
@@ -511,43 +511,43 @@
default is legacy modesetting. pass module option r4xx_atom
to try using atom on r4xx.
-commit c32fe63d91a2a0b531d067ef7e88eb4584771247
+commit d9c75db3296a12b4af0f506cd640ab91276bd3da
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 db82d42dfb965efead33cad55656ff1e57879c46
+commit eb1dde1c1357e25cb963697b414aae48b94bfa0b
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 29 14:50:47 2008 +1000
radeon: add r600 modesetting registers writes
-commit 14b9dcd3195b06bc0f0a8a15d6e238ee7ac11ea9
+commit d125e6cd194c191756d3c48778bb4f00028acf07
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 38c17ab240e8b23f49864e6654a28d5ab5fa76e5
+commit 6a42bde1aa36ab06d7da0b9b786af794dde22832
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 6c7801bc5b86902a3fc0aaf8e272059fa1bbb147
+commit 47dff62cdd0f12ca99d4280b7461db98d496e578
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Sep 23 16:34:55 2008 +1000
radeon: fix minor cursor disappearing issues
-commit 4d139e05f1f340b178698b3456c3bd2b3c55766d
+commit 31571d064f247be02b02c4542ab3f974bc5cc8fd
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 697a69fe67dd67fefcbb47b745ddadf67ed7e352
+commit 3c905add20d327195abc43af20acec82282958c6
Author: Kristian Høgsberg <krh at redhat.com>
Date: Mon Sep 22 12:00:57 2008 -0400
@@ -556,31 +556,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 9a5312255f29d7a6891b356249cec41fe7c0c27a
+commit 4134e5475bfad3d34925d51a522b58af6f0e64cc
Author: Dave Airlie <airlied at linux.ie>
Date: Sun Sep 21 09:48:51 2008 +1000
drm: fixups on top of rebase
-commit c10427bc83e6d3e44dde172ca4b02be6edfce6c9
+commit babc527c770c8a17392404a1b748572f74234501
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 03:08:05 2008 +1000
radeon: rmx_fixup() fixes for legacy chips
-commit d900c30be3a23efa608d4aeb8fe3273b18634b16
+commit 24eb6690cbd2560c8a0023db019ecbbb3236952e
Author: Dave Airlie <airlied at linux.ie>
Date: Sat Sep 20 01:55:27 2008 +1000
radeon: fix combios
-commit bd43b68c04f84b0f680cba22929b47ea8994c2dd
+commit 67f50136b02ccf0b0ebb57fab5c06bdcfdc4b083
Author: Dave Airlie <airlied at linux.ie>
Date: Fri Sep 19 09:17:36 2008 +1000
radeon: port Alexs patches from modesetting-gem
-commit 4fb4c9243ccad7c1d8cafe641a752dc93a65cfca
+commit 6bc65be41a47d1703f9b890279a59c362d01fd40
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:10:29 2008 -0400
@@ -589,7 +589,7 @@
Shouldn't trigger under normal use and when something breaks, it will
be easier to debug.
-commit 1d0d4dfea459233a68672287bf6df219d9caae0f
+commit af0d41e6ecff2d3f03c7b5ebee8616458022932b
Author: Kristian Høgsberg <krh at redhat.com>
Date: Thu Sep 18 16:07:50 2008 -0400
@@ -598,25 +598,25 @@
The X server emits writes to R300_DST_PIPE_CONFIG for R420 chipsets during
accel init.
-commit 6ac0f8df8dc7072ad75f4259cf965189d7b173f4
+commit 2a225ec2e9c1abf85e421bca88b4e2b2cbc62b7b
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 559bc855adbd7e2de8ca0f7883304925b036c8ca
+commit 37a935e8e6480eecac29f3c562cdc8e3056a90a5
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:55:14 2008 +1000
radeon: further LVDS fixes
-commit ccbc88ef2776bf4f440fd02ed5792204a65b9500
+commit 3bb2b6206ff145184c072c1ad9cd2e1493ce8e1c
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Sep 18 09:54:12 2008 +1000
radeon: legacy lvds updates
-commit 926ff3aaf29f3c8429dd7c7ca66732af1788d383
+commit 9c54f348d999a70f71fd7796035c55c010e9ccc0
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:26:27 2008 +1000
@@ -624,7 +624,7 @@
just fallback around busted stuff for now
-commit 2d3b0a31653310c57ceaf431601885cd3182369f
+commit ae1d4181149eb38318a10dad01982ac509a06cae
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 18:25:18 2008 +1000
@@ -632,13 +632,13 @@
also dirty buffer on validate
-commit aefdba67e5d95a57d4bb6583964663626ed36ac4
+commit 1664388f2b24fef55b7ad53350335052174a5054
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 17:13:32 2008 +1000
radeon: disable blit moves
-commit cbe859c2f80618cb4f2110b96bd476bd82519edf
+commit b2830926ca8bb668767b565a2a5e11eacf1ff54e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 11 16:18:27 2008 +1000
@@ -646,73 +646,73 @@
Normally this will be due to an AGP driver needing updating
-commit bfe72bb97eaa3b58f034ab1a1f78416810369eab
+commit b3e873b238056b4a70ad77f067eeed80ff05dfe1
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 28f4711d196256422914ea4e0cbec17d969ee40f
+commit af8a0eff6768d2856e4cbd79a96ae0a7af7cf1d4
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:35:08 2008 +1000
radeon: fix return value
-commit 785f962b8b6096324eae5d918c9ba7794ef99e69
+commit cbe8465b821dee9869a82d4cf47f4f6ce0828832
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Sep 10 14:34:39 2008 +1000
radeon: fixup reference counting properly
-commit 3900200089af59599f3ef1fcf5461dff320d01b2
+commit 68a31a974bc1cd3e60b6ff9dc9bd2f2e77336f08
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 cddc62790ba7f48aabea09fda4781a2be1d194b0
+commit 83e268c02b6c3476a256d682b4cbdb095aa804a8
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 11:37:26 2008 +1000
radeon: remove unneeded debugging
-commit f4f86592f4d444b3f470944cc8224bc07986d751
+commit 6a74a2aa7882f1b47abb45ca2718b652dbdda3cc
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 bfdc520958b528bb906ce58d4b47ff4730adea87
+commit 4a25fe8f4cdd014fef8ae35e242b55540b904124
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:27:48 2008 +1000
radeon: disable debugging that sneaky itself on
-commit 7c196b8163a071f6d36c07af22998b09ca904d48
+commit e633eda20d4bceb9a7dff5fcc34bf665d5245318
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Sep 8 10:20:44 2008 +1000
radeon: make text reserve 256k
-commit 34bf845293a582aabbbb749379d3826ecd028ff3
+commit da1fa9f95b6f527d1accd76af9bb5f8a0c600687
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 795ae723e8961a74d4f0231183dc85543ce02ec6
+commit c18988886262d8b9963656ce6668f2d334fd44bb
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 f90df56a797a12ee2aad20fbf2aa0e8cefb2398e
+commit 001df7ee5c1a616cb77d58a97077fc9fd0c7d21b
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 16:12:59 2008 +1000
radeon: further suspend/resume support
-commit de93412674cdcb59fcb8ed028b7f3c463d53376e
+commit b90620f44bfd413396680fd326ca305d4a898904
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 14:52:15 2008 +1000
@@ -720,19 +720,19 @@
this gets us back to fbcon.. its dirty like zebra
-commit b2028d7b95cc21a57e440ca3d614a845ab47d077
+commit 4b7754b8a3e626c135e8644893914a27ffb03ab5
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 13d6ef9d8b7c68694e324491bd041dc5f74ad47c
+commit d2ca385e4847995137b1f28e3aff91184b7876c2
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 29d1e9a24a00034e81fcf421cd586c67e28f5664
+commit a1b14d74b49402ec7b33d9a9c9270fd70469c26e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Sep 5 10:46:17 2008 +1000
@@ -740,13 +740,13 @@
Allocate the rs480/690 tables from uncached memory.
-commit a9fe1fa367b93fbb91e2b94fbc8567c95c37b389
+commit 8bbe333a42b7b1124bbb00d54589c4b56daecd29
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 4 11:58:08 2008 +1000
drm/radeon: fixup some avivo/rs690 checks
-commit 39a6c7fc4051b538f9915f1ec9a9f724efa20c48
+commit ad3d4d25fcf87a4194d4fc5562b9ffee7a0552a7
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 29 09:59:02 2008 +1000
@@ -754,7 +754,7 @@
also change name from text to nomodeset
-commit 5c8cfcca48053a34f95b49dc762a2cd08148711f
+commit 3e6076ce88f3f860cb635e39324dd409bef58194
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 21:22:27 2008 +1000
@@ -762,13 +762,13 @@
also don't explode on lack of DDC
-commit 649675ebb5f6654587d73a23a8eae78b5ef07370
+commit d75f2092bf9b7b1f5b884fb9ab71f77bd3261a8e
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 18:31:50 2008 +1000
drm: fix dev->master convert
-commit f737d146f1f3287d485d970e6f217de6a3f7ebd9
+commit 4a1a8f50b5eadd1a08bf3df20b0ae3527297bbec
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:26:11 2008 -0400
@@ -778,7 +778,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit e2c4fd1dedc4e0365c07eb88ef5225d2be9b1746
+commit fcefeed023d2b3e8d1f408755fdde2c58eddbc5e
Author: Kristian Høgsberg <krh at redhat.com>
Date: Wed Aug 20 11:24:13 2008 -0400
@@ -790,7 +790,7 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit d9b3206c40969ab2f07f8059413aaebf268e441d
+commit 69f6455fa50909116e1653de39345b2d247cd6c3
Author: Kristian Høgsberg <krh at redhat.com>
Date: Tue Aug 12 22:39:54 2008 -0400
@@ -803,13 +803,13 @@
Signed-off-by: Kristian Høgsberg <krh at redhat.com>
-commit 59077b5ee03faf91024028de50e75ae1b3ca1f1a
+commit 538f8dce3ea85e7c7adb8b0a02e475c171309c52
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:49 2008 +1000
radeon: fix LVDS on atombios - typos
-commit fed02f7782eabc3e92c0601cc81e7e99218330c9
+commit 7d1b46264ede23de822a05e740121ada887b495d
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 28 16:38:34 2008 +1000
@@ -817,43 +817,43 @@
This should do a better job at picking the initial configuration crtcs
-commit 72f7b5697d72627f994e3cc8b68debaee927597e
+commit 500ec649f8905bb20ff23e196ce3cb1c01b20705
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 6f78cf0981ab462bb94f9737d35734f19c61e9a1
+commit f8f852768b09d682c654632cae27c3e9ec696f07
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 c31ee74ed9fc3b98ce42241677c8ce0e154b7797
+commit 21d6abd359f58f23d996879ec133db2e2ee354c9
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 15:39:17 2008 +1000
radeon: fix after rebase
-commit c3d58fc173ec5498834805057ac974bfa2393ec6
+commit a0839d086f99512b74446b7accdeaa16f85f0c14
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 27 13:43:23 2008 +1000
drm: fix whitespace
-commit c12fc27be229d9b439c16261b398f9860f6b3b22
+commit fb7e89e319f0850df528633c28015bc0ee1ebf07
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 cd2378af5d057e1c88d978613edb56a3a046d163
+commit 4c6113c037f765667ed248df18aa0a8e999064f6
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 281509f0606fba332926bf209ffd5c2b3918906e
+commit 3f9268d84c416a32a229ff2f89f5273ad69d471f
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:37 2008 +1000
@@ -862,7 +862,7 @@
- done: primary dac, vga on tvdac
- todo: ext dac, tv on tvdac
-commit 06373e8128ef61ebf6a9c2d6fc931969042edd81
+commit a24f9a8b7d46ab1126c447c4f199ad3225669a62
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:22:11 2008 +1000
@@ -870,25 +870,25 @@
- todo: updated connected status
-commit 7878013542931529e9d85266d38e5f7ce3a9b0ef
+commit 9fb0332a2836e4a4a0cb4d5ca022a3e316f3eb7e
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Tue Aug 26 17:20:54 2008 +1000
radeon: remove unused legacy state
-commit 21acdaedb44172174a1b3da73311e1137f1e98ee
+commit fad7295ebd5f8254159560f231f519799fa65140
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 6d09134f8e0c13439d48ba914e83024df95dd732
+commit 5b9d1bfd2cd6f703d195c76cffdab7ea8720b457
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:03:13 2008 +1000
x86: export pat_enabled
-commit c10a45a6acc6420ca682a017d19f756f862c38d7
+commit 4a034f9dd0d209dc93da6bc62ad6a65836d2ac5e
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:02:43 2008 +1000
@@ -897,7 +897,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 fe9106c6b5e7709338c98325f974b0248229ab6f
+commit d0e392a512b191165f1d511c6aea74deb914e7cf
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:01:35 2008 +1000
@@ -906,7 +906,7 @@
move domain validate function to separate function
call it from correct places
-commit 18a6de6280aba92c84f6d5e04d8e21ace5ac1262
+commit faed0f9e3655fff496d452fdc623dd3a7833c17a
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 26 17:00:49 2008 +1000
@@ -915,37 +915,37 @@
If a BO hasn't been dirtied, do a solid fill on VRAM instead of
migrating pages to VRAM
-commit 65780bbf75751d212743734b7c9610049958de6e
+commit 2b88dc20f489471ddf01c6f6341954245bf51160
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 76e9eea78a8e28bed2f6c44fc07184df564bcf5e
+commit 6688ae9c433e74887d51909c562229db89d951df
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 8f3e51e58bcb6537e0c82aaf4d560aabead399dc
+commit 5429750a7325f3e21e3a965546d65d1c126c36c1
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:16:01 2008 +1000
radeon_gem: fix some misplace ==
-commit f174e11fed8c56a1c99c616d2e26af3cdde50daf
+commit 2e6e65cedee7df948622fe7fe552932cf649e599
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:13:25 2008 +1000
radeon: get buffer upload working
-commit 15ef92b2c70ac002d337f055969429c3c76775b6
+commit eeb900317739742d8ad388a82369687a179b253f
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 7f0e2ccc44d2408e8319f4c0d641be1905359dae
+commit 5ff3a5c377334cacfbad3020565ffd258955590a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 10:11:55 2008 +1000
@@ -954,7 +954,7 @@
We need a buffer zeroing function for before we have
accel running etc
-commit 1ed6c585d5c74e001efbe62c31a8e0b17642ed1d
+commit 964f7c942fd3a817a33b6e79916e988c7ac7f941
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:49:16 2008 +1000
@@ -965,49 +965,49 @@
Primarily for the move code when we get a buffer in VRAM, we don't need
to copy the contents just zero them.
-commit ed7df3f06f63acfff0f7d923ec5a9e4f893844de
+commit 8348d65153ec5ecba614cce3115a4959e6929569
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 9f4fc06c539fc8dfb158023780b9093946032885
+commit 11f0dd1a31d1d880c24def5b8cf18a1f918c686a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 22 09:35:26 2008 +1000
drm: remove tlb flush logic from ttm
-commit 202b58bd783dca06a603cf81fdc11fec20812c89
+commit e6644571e0b7679fa37ea386609ca9b449036846
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 b7f442cb53e70adbc363494665487af5d12ff5b0
+commit 60646387e23d9f80e713c7b1e4fddecb917711a7
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:16:13 2008 +1000
FEDORA: add radeon copy root patch
-commit c3200fae7937e6a0339e59fcc45098255bdc9041
+commit 92c1c325c8257633ddb6e5d4b6a427675a8b56f8
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:15:10 2008 +1000
radeon: fix bug in scratch retreival
-commit 89a66b690dd4d452de8b0674342c57367188ccda
+commit 974565e72f39798a676134ed693217186be03f69
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 19 12:14:38 2008 +1000
radeon: add GTT domain
-commit a45d10c17123af9756c9d9d36c966ff596386390
+commit 6deaeff19f9533fdc245df3a792f18793643adb4
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 08ccc35ff5b76149c1ed1a9f45e66d6356241f7e
+commit 86b1b8499616ac50a5f599627f475c502209058e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 14:28:43 2008 +1000
@@ -1019,37 +1019,37 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit de5609a2352cdadc17b6169fec3af1543eff1ba9
+commit 950d2037f2a46af37abb9cefcc3a3d5eacc8b0c0
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 18:14:56 2008 +1000
disable modeset on < r300
-commit d7e861f83d6f01fccdc21171976957a1c220bdb2
+commit 7d1a36db164c1d9fe0a59184b2b471e379fcd03c
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 9b8d4c26b67bbcb923402b3a793c794aadfa4695
+commit bb9242fab19827a0abcbc2a4a2729e5ce7f151a1
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 15 09:35:55 2008 +1000
radeon: fix LVDS modes problem
-commit 453272e1ba668f6eb755ce6744d91af5bcbd114c
+commit 6b6a46e170fc6eae32844b3399d836a25e37e48e
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 0a277dfbfbbe316d5d3c4dfbde1e365e43eca4dd
+commit 03bc93c1257cce5914675d8e3e657706280cb12a
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 0db218dc113a1e163c9c1e076b85c2872edf127a
+commit 6a0aec62887989efe8161605d1f60d2de27d4bca
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 15:23:51 2008 +1000
@@ -1057,7 +1057,7 @@
Need to add to Intel when we get there
-commit 34daa88f3c7fdb02466e080b780c9e7bd662d31d
+commit 3e7749ac8536881d6aaff9086aced8a73f810974
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:38:27 2008 +1000
@@ -1065,31 +1065,31 @@
This gets RN50 to initialise correctly
-commit 3eaee9ce962c0607876b088dd33ff17df7e6366c
+commit 0d85c4f30c71d19d25f0218ec9768d204d68ca82
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 14:37:25 2008 +1000
radeon: add copy/solid regs for rn50
-commit 4fd7985fd9180c473aa0882de2b20c8794e826ce
+commit 3fc8c88b2b8946d3309a33ba4a1d137c62e2a189
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 76f0e4e10e193e57632d4b7cde428ddc4f59b47e
+commit 5e7220a179bfbbe8f91e247db5e403cb3a4ffadd
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 09:59:31 2008 +1000
radeon: add quirks from DDX
-commit 179163f593237ef65e695bf21982fa708f31c8fc
+commit 7d3a9dd7c225653ef1bf918442b7fd475d46df5c
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:59:12 2008 +1000
radeon: fix warnings
-commit d0dd7fd730fd88f64124931ef25abf5e05a1c72e
+commit 61b1a5addaebe62dd2aacbaa3516442085f70ec4
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:58:47 2008 +1000
@@ -1100,31 +1100,31 @@
- add debugging for tracing calls
- fix pitch calculation
-commit 4636d389c4966d86686577add4a334a96980b473
+commit f33802be711fbca52e86ea6e7f2924543e791875
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 a5539f4784b6fe88973c1a8046301a7d7ca36af5
+commit 393d22ffe96c7a0f64e05cd1d76b214c1c4d10f4
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 f7776998ab66a1bf00dc0c367ff70165b9b88881
+commit a6606354e22068750f6973d1fdc4489c6be0937e
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 b8fa51978f9de79e2f77581568b07f6f92d10288
+commit a9fc7be277f8317379600d841275019281fff58f
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:53:08 2008 +1000
radeon/atom: implement crtc lock
-commit 31ca3d0795c75aff1452fae4973297410e6f18b8
+commit 061371ef774cb24206912956444142a1984883e9
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:50:15 2008 +1000
@@ -1133,7 +1133,7 @@
- Add gamma set for legacy chips
- Add 16 bpp gamma set
-commit a85d02155f6b3d3b802309e1d1386503c333a8d0
+commit 60c722c4b03b96c78c60a1a8e7281139fb5ec782
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:55 2008 +1000
@@ -1143,19 +1143,19 @@
- move i2c_lock to radeon_i2c.c
- enable tv dac on legacy
-commit 3abfbd31a3176389bbba4d7ee2011b336955a18e
+commit 10208268909c3512660c43c74ca0d17522c30645
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:49:30 2008 +1000
radeon: Add legacy dac detect stubs
-commit 0920d26c557b5a60d22dc7bea52a9d2faa81eed1
+commit 8a6b07807e94dd83e06a6428974ec9f8d3a428ca
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 9d4a6923b0000d9656a6bc6b6724d9cb8b9ac145
+commit 63d9d43e233e7aac6cc107d9c4fc5083bb525b3c
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Thu Aug 14 09:48:50 2008 +1000
@@ -1163,25 +1163,25 @@
- removed save/init/restore chain with set functions
-commit 1a0792a75a00b189a04972803a35ec610b78b180
+commit 5ccbd2622bae1d23ff0e3842f4de5011302171c5
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:54:04 2008 +1000
FEDORA: radeon set gart buffers start
-commit 013cd174dba96a6de4d84220a79fabc0ecc9c9bf
+commit a92fe3318a6784203aa56affc43d9d119bc6b981
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Aug 14 08:52:41 2008 +1000
radeon: command submission remove debug
-commit 05324e03f585bbd3be6e7d588e4b7b4a639f5614
+commit 729e80339d8446652b6e734e7431c052e7eded0e
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 2204fd39722bcd7ef03fd8d98b173a3cbbea9793
+commit 030d8aa5cb4dee9fa7a4516737c4aecfeeee10bc
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:19:05 2008 +1000
@@ -1189,19 +1189,19 @@
in the correct place in the drm so buffer swaps work again
-commit e43f4588c1f483cfb67b1c9b2f2e3b1c983a55cd
+commit ef8e44efc81ec2200cb23d9710b0d9d5cc465535
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 12 12:18:08 2008 +1000
radeon: add mm supported call for userspace
-commit d4a4322e03a709993f2ee012ccc27709e63db5d4
+commit 95c10e2a8a14d511e78ac2484e3dfba31d1c247d
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 838a375824eebf939c93a420fd6a7af4ac468c6e
+commit 4c8995e222592707306afb6a6ed894f4d8f5e4a0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 15:57:10 2008 +1000
@@ -1210,7 +1210,7 @@
This adds the CRTC and PLL setting code, it doesn't work
yet but its all heading in the right direction.
-commit da5a8c8a6a53e343dd8cfbb87e6f905a23d1608a
+commit 99961a9470bca5cd849da7c03d357335dce0e171
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 8 13:32:50 2008 +1000
@@ -1219,67 +1219,67 @@
In theory we should be setting the mapping for the legacy node.
the inode for the control node might be different.
-commit addb6ad477cf0594541191e6802bf13231033cef
+commit b0f7faee0a0b7d05210e36a492598f3798d10da2
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 11686fc1c9af6d59fcc484fc344ab2378d43745e
+commit d482659e11d4f97da021b04628773ad7bd9a72b1
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 16:01:22 2008 +1000
radeon: set new memmap on gem enable
-commit 6e7dc657cdb0e1e12853d200472f6352e425b57b
+commit 7bdf68db30d03449d9158c4804b2ca1f62751785
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 071a073fbb2acbe830dd4fa786eb05f0474948f6
+commit bafc4903a7b469919ec33193af7611a729f357ae
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:38 2008 +1000
radeon: set gart table size
-commit fcf49c9e160b52f17c724a346542306fe4e87b7a
+commit 8bde80cb6063ae6849c59f0d19e6b5324c1a9ed0
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Aug 6 15:44:18 2008 +1000
radeon: fix buffer evict slection
-commit 5b4757f2f5fc7f11fad67ce2cac53c83dffc28a4
+commit 32bb60d155e9ce5fd88066e83a0aa53b31d80032
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 648bb026d5b8b402eb56b3a6fa8ae99178377c04
+commit c5539be194a188990bdf162da4dca08e17cf34ac
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 1942ee498d0c5122dc2db1167d516f0307199173
+commit 049acb42104e64a28151d29bb48c8b442bc96553
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Aug 5 11:22:24 2008 +1000
radeon: fix defines so blit works again
-commit 262f153d005bdf2a92211bce16cd5a55e9b44ea2
+commit 163f165c069de11a3e9150d46c636a4ec0794fc5
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 ce0809ddf355edc21b3353638cca0066c4c8435f
+commit e22b0d3b8e14965a69cf281ffc14d4ab44d2df23
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:21:22 2008 +1000
drm: fix unneeded debug
-commit 8cc9be2d095d1cb3146d5fe932d54a79d024457d
+commit d1d6faa3c768e0ff0d77e22c68e7682f2cc4353d
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:47 2008 +1000
@@ -1287,49 +1287,49 @@
if kms enabled memory manager will be enabled by default
-commit 4d5df5c134c0fb7cb8680152bff0993e2a8d79e8
+commit e22e56ced07bb6862f2d2a32800dbb401c073eca
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Aug 4 14:20:26 2008 +1000
drm: kill bo after driver lastclose
-commit 2441bde9274e38b497fd7e0f5a4c8900991cbba6
+commit 8175c1b60423a2bbe4b710f7d25f96d196597e90
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 632133c986908ebd2c9dedbc033202ed9c94e9c1
+commit 9fbcd6c03ff2ed52f6b427ee2937ea16522d0493
Author: Dave Airlie <airlied at redhat.com>
Date: Sat Aug 2 08:06:26 2008 +1000
drm: fix release locking
-commit 3e88e208dc58abf1a07706cc1ea843b5c6a9acd0
+commit 092126a42d32781ba789f88a911ecad628fb49f0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 23:39:24 2008 +1000
fix build on powerpc
-commit e49aefaf64778eadec602027bd347a5b84014769
+commit 573feb4f48f8e7785771843ce1a147957c3df548
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 16:55:34 2008 +1000
drm: add radeon modesetting support
-commit 7d977999ce46f9b824c16e743b1d3f2497e45005
+commit dc984778760a11cde80aca48e5c3d42da925ae7e
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:07:35 2008 +1000
drm: add modesetting support
-commit bcb5d1dd38bf9b3ed2e1a55f1311c113c1caf7b9
+commit 116604b91a61e26ed4337d3b8b6770b3d676970a
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 14:06:12 2008 +1000
drm: add TTM VM changes
-commit e3ae45bbcd6ddc107ce9dfa47a429922b256e3c6
+commit 80ecb7635a70ad09110da5f715f0f5e669d9f3fc
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:24:36 2008 +1000
@@ -1337,13 +1337,13 @@
This adds the control device nodes also
-commit a93edf761e8c3db101aaa0f4f113cf87f591bff1
+commit 963ba3c1964025111d27f769e12b334362e87bc0
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 11:11:06 2008 +1000
drm: add set/drop master ioctls
-commit 46bd4453d68f6c8651672ca4cd2406983ef15e38
+commit 00449597bfb70189ae2f626e69a85e13c75e9b46
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:57 2008 +1000
@@ -1353,13 +1353,13 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 5e7eb1387349860a143dd0ef404685d695a09015
+commit d6d060b7ecef9b5de13d1f22e207d0dd01b369ad
Author: Dave Airlie <airlied at redhat.com>
Date: Fri Aug 1 10:23:40 2008 +1000
drm: make sarea_max unsigned long
-commit cbcc953b7b574efea10d75c03635e2c808b836ee
+commit 80216f64326b65946a8755843a96ed4a5658bd7f
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Jul 31 15:27:27 2008 +1000
@@ -12963,7 +12963,7 @@
+ master->driver_priv = NULL;
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index 047b9d7..d0bb829 100644
+index 654d42f..a16fce3 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -168,6 +168,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
@@ -12972,21 +12972,21 @@
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+ struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;
u32 iir, new_iir;
- u32 pipea_stats = 0, pipeb_stats = 0;
+ u32 pipea_stats, pipeb_stats;
int vblank = 0;
-@@ -201,9 +202,8 @@ msi_interrupt_again:
- I915_WRITE(IIR, iir);
- new_iir = I915_READ(IIR); /* Flush posted writes */
+@@ -205,9 +206,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
+ I915_WRITE(IIR, iir);
+ new_iir = I915_READ(IIR); /* Flush posted writes */
-- if (dev_priv->sarea_priv)
-- dev_priv->sarea_priv->last_dispatch =
-- READ_BREADCRUMB(dev_priv);
-+ if (master_priv->sarea_priv)
-+ master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+- if (dev_priv->sarea_priv)
+- dev_priv->sarea_priv->last_dispatch =
+- READ_BREADCRUMB(dev_priv);
++ if (master_priv->sarea_priv)
++ master_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
- if (iir & I915_USER_INTERRUPT) {
- dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
-@@ -246,6 +246,7 @@ msi_interrupt_again:
+ if (iir & I915_USER_INTERRUPT) {
+ dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
+@@ -252,6 +252,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
static int i915_emit_irq(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -12994,7 +12994,7 @@
RING_LOCALS;
i915_kernel_lost_context(dev);
-@@ -255,8 +256,8 @@ static int i915_emit_irq(struct drm_device * dev)
+@@ -261,8 +262,8 @@ static int i915_emit_irq(struct drm_device * dev)
dev_priv->counter++;
if (dev_priv->counter > 0x7FFFFFFFUL)
dev_priv->counter = 1;
@@ -13005,7 +13005,7 @@
BEGIN_LP_RING(4);
OUT_RING(MI_STORE_DWORD_INDEX);
-@@ -294,21 +295,20 @@ void i915_user_irq_put(struct drm_device *dev)
+@@ -300,21 +301,20 @@ void i915_user_irq_put(struct drm_device *dev)
static int i915_wait_irq(struct drm_device * dev, int irq_nr)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -13032,7 +13032,7 @@
i915_user_irq_get(dev);
DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
-@@ -320,14 +320,11 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -326,14 +326,11 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
}
drm-next.patch:
Index: drm-next.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/drm-next.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- drm-next.patch 17 Nov 2008 08:32:01 -0000 1.7
+++ drm-next.patch 18 Nov 2008 07:09:47 -0000 1.8
@@ -1,4 +1,4 @@
-commit 894540f219ca3d87be7acbe7833d86119b624fa5
+commit 44078e77a4901e91836b5f9f0fae28d8fac2a17d
Author: Keith Packard <keithp at keithp.com>
Date: Fri Jun 20 00:08:06 2008 -0700
@@ -14,7 +14,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
(cherry picked from commit 395e0ddc44005ced5e4fed9bfc2e4bdf63d37627)
-commit 7b2a72df0e653c49327dc90651120e848cad6d28
+commit 79dd949af73e830f6929b0faf7f3eb409a481166
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Nov 3 11:07:28 2008 +1000
@@ -25,7 +25,7 @@
Signed-off-by: Dave Airlie <airlied at redhat.com>
-commit 852f6a210d90848774673a08d03bf85a7b8fffdb
+commit beb6264cb9eb4f78f9b2754d4a577330f09d108e
Author: Dave Airlie <airlied at redhat.com>
Date: Wed Nov 12 15:00:33 2008 +1000
@@ -33,7 +33,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 147d7004520f5c6a8b77f16614bd1d699909d9b4
+commit e94cd33277b4f95be8d0a19f3fe32e8daef9ce94
Author: Eric Anholt <eric at anholt.net>
Date: Tue Nov 4 15:50:30 2008 -0800
@@ -51,7 +51,7 @@
Signed-off-by: Eric Anholt <eric at anholt.net>
-commit 022490db8d14abd18a83b8bb93fdbe2a5ae4e064
+commit 3437c28f678abfa0e7ebe78176b268cbf0732e81
Author: Keith Packard <keithp at keithp.com>
Date: Tue Nov 4 02:03:27 2008 -0800
@@ -8972,10 +8972,10 @@
+ return 0;
+}
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
-index df03611..047b9d7 100644
+index df03611..654d42f 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
-@@ -31,259 +31,213 @@
+@@ -31,260 +31,220 @@
#include "i915_drm.h"
#include "i915_drv.h"
@@ -9289,61 +9289,63 @@
struct drm_device *dev = (struct drm_device *) arg;
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
- u16 temp;
-- u32 pipea_stats, pipeb_stats;
+ u32 iir, new_iir;
-+ u32 pipea_stats = 0, pipeb_stats = 0;
+ u32 pipea_stats, pipeb_stats;
+ int vblank = 0;
+ unsigned long irqflags;
++
++ atomic_inc(&dev_priv->irq_received);
++
++ iir = I915_READ(IIR);
- pipea_stats = I915_READ(I915REG_PIPEASTAT);
- pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
-+ atomic_inc(&dev_priv->irq_received);
++ if (iir == 0)
++ return IRQ_NONE;
- temp = I915_READ16(I915REG_INT_IDENTITY_R);
-+ iir = I915_READ(IIR);
++ do {
++ pipea_stats = 0;
++ pipeb_stats = 0;
++ /*
++ * Clear the PIPE(A|B)STAT regs before the IIR
++ */
++ if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
++ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
++ pipea_stats = I915_READ(PIPEASTAT);
++ I915_WRITE(PIPEASTAT, pipea_stats);
++ spin_unlock_irqrestore(&dev_priv->user_irq_lock,
++ irqflags);
++ }
- temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
-+ if (iir == 0)
-+ return IRQ_NONE;
++ if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
++ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
++ pipeb_stats = I915_READ(PIPEBSTAT);
++ I915_WRITE(PIPEBSTAT, pipeb_stats);
++ spin_unlock_irqrestore(&dev_priv->user_irq_lock,
++ irqflags);
++ }
- DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
-+msi_interrupt_again:
-+ /*
-+ * Clear the PIPE(A|B)STAT regs before the IIR
-+ */
-+ if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
-+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-+ pipea_stats = I915_READ(PIPEASTAT);
-+ I915_WRITE(PIPEASTAT, pipea_stats);
-+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-+ }
++ I915_WRITE(IIR, iir);
++ new_iir = I915_READ(IIR); /* Flush posted writes */
- if (temp == 0)
- return IRQ_NONE;
-+ if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
-+ spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
-+ pipeb_stats = I915_READ(PIPEBSTAT);
-+ I915_WRITE(PIPEBSTAT, pipeb_stats);
-+ spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
-+ }
++ if (dev_priv->sarea_priv)
++ dev_priv->sarea_priv->last_dispatch =
++ READ_BREADCRUMB(dev_priv);
- I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
- (void) I915_READ16(I915REG_INT_IDENTITY_R);
- DRM_READMEMORYBARRIER();
-+ I915_WRITE(IIR, iir);
-+ new_iir = I915_READ(IIR); /* Flush posted writes */
-
+-
- dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-+ if (dev_priv->sarea_priv)
-+ dev_priv->sarea_priv->last_dispatch =
-+ READ_BREADCRUMB(dev_priv);
-
+-
- if (temp & USER_INT_FLAG)
-+ if (iir & I915_USER_INTERRUPT) {
-+ dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
- DRM_WAKEUP(&dev_priv->irq_queue);
-+ }
-
+- DRM_WAKEUP(&dev_priv->irq_queue);
+-
- if (temp & (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {
- int vblank_pipe = dev_priv->vblank_pipe;
-
@@ -9371,38 +9373,47 @@
- I915_WRITE(I915REG_PIPEBSTAT,
- pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
- I915_VBLANK_CLEAR);
-+ if (pipea_stats & I915_VBLANK_INTERRUPT_STATUS) {
-+ vblank++;
-+ drm_handle_vblank(dev, 0);
-+ }
+- }
++ if (iir & I915_USER_INTERRUPT) {
++ dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
++ DRM_WAKEUP(&dev_priv->irq_queue);
++ }
+
-+ if (pipeb_stats & I915_VBLANK_INTERRUPT_STATUS) {
-+ vblank++;
-+ drm_handle_vblank(dev, 1);
-+ }
++ if (pipea_stats & I915_VBLANK_INTERRUPT_STATUS) {
++ vblank++;
++ drm_handle_vblank(dev, 0);
++ }
+
-+ if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
-+ (iir & I915_ASLE_INTERRUPT))
-+ opregion_asle_intr(dev);
-+
-+ /* With MSI, interrupts are only generated when iir transitions from
-+ * zero to nonzero. If another bit got set while we were handling
-+ * the existing iir bits, then we would never get another interrupt.
-+ * This is fine on non-MSI as well, as if we hit this path we avoid
-+ * exiting the interrupt handler only to generate another one.
-+ *
-+ * Note that for MSI this could cause a stray interrupt report if an
-+ * interrupt landed in the time between writing IIR and the posting
-+ * read. This should be rare enough to never trigger the 99% of
-+ * 100,000 interrupts test for disabling stray interrupts.
-+ */
-+ if (new_iir != 0) {
++ if (pipeb_stats & I915_VBLANK_INTERRUPT_STATUS) {
++ vblank++;
++ drm_handle_vblank(dev, 1);
++ }
++
++ if ((pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS) ||
++ (iir & I915_ASLE_INTERRUPT))
++ opregion_asle_intr(dev);
++
++ /* With MSI, interrupts are only generated when iir
++ * transitions from zero to nonzero. If another bit got
++ * set while we were handling the existing iir bits, then
++ * we would never get another interrupt.
++ *
++ * This is fine on non-MSI as well, as if we hit this path
++ * we avoid exiting the interrupt handler only to generate
++ * another one.
++ *
++ * Note that for MSI this could cause a stray interrupt report
++ * if an interrupt landed in the time between writing IIR and
++ * the posting read. This should be rare enough to never
++ * trigger the 99% of 100,000 interrupts test for disabling
++ * stray interrupts.
++ */
+ iir = new_iir;
-+ goto msi_interrupt_again;
- }
++ } while (iir != 0);
return IRQ_HANDLED;
-@@ -298,23 +252,45 @@ static int i915_emit_irq(struct drm_device * dev)
+ }
+@@ -298,23 +258,45 @@ static int i915_emit_irq(struct drm_device * dev)
DRM_DEBUG("\n");
@@ -9457,7 +9468,7 @@
static int i915_wait_irq(struct drm_device * dev, int irq_nr)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-@@ -323,55 +299,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
+@@ -323,55 +305,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
READ_BREADCRUMB(dev_priv));
@@ -9526,7 +9537,7 @@
/* Needs the lock as it touches the ring.
*/
int i915_irq_emit(struct drm_device *dev, void *data,
-@@ -381,14 +336,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,
+@@ -381,14 +342,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,
drm_i915_irq_emit_t *emit = data;
int result;
@@ -9544,7 +9555,7 @@
if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {
DRM_ERROR("copy_to_user\n");
-@@ -414,18 +370,38 @@ int i915_irq_wait(struct drm_device *dev, void *data,
+@@ -414,18 +376,38 @@ int i915_irq_wait(struct drm_device *dev, void *data,
return i915_wait_irq(dev, irqwait->irq_seq);
}
@@ -9591,7 +9602,7 @@
}
/* Set the vblank monitor pipe
-@@ -434,22 +410,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
+@@ -434,22 +416,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
drm_i915_private_t *dev_priv = dev->dev_private;
@@ -9614,7 +9625,7 @@
return 0;
}
-@@ -458,19 +424,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -458,19 +430,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
{
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_pipe_t *pipe = data;
@@ -9635,7 +9646,7 @@
return 0;
}
-@@ -481,104 +441,21 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
+@@ -481,104 +447,21 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
int i915_vblank_swap(struct drm_device *dev, void *data,
struct drm_file *file_priv)
{
@@ -9755,7 +9766,7 @@
}
/* drm_dma.h hooks
-@@ -587,37 +464,65 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
+@@ -587,37 +470,65 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -r1.1151 -r1.1152
--- kernel.spec 18 Nov 2008 02:30:52 -0000 1.1151
+++ kernel.spec 18 Nov 2008 07:09:47 -0000 1.1152
@@ -659,6 +659,7 @@
# nouveau + drm fixes
Patch1800: nvidia-agp.patch
Patch1810: drm-next.patch
+Patch1811: drm-next-intel-irq-test.patch
Patch1813: drm-modesetting-radeon.patch
Patch1814: drm-modesetting-i915.patch
Patch1815: drm-nouveau.patch
@@ -1306,6 +1307,7 @@
# Nouveau DRM + drm fixes
ApplyPatch nvidia-agp.patch
ApplyPatch drm-next.patch
+ApplyPatch drm-next-intel-irq-test.patch
ApplyPatch drm-modesetting-radeon.patch
#ApplyPatch drm-modesetting-i915.patch
ApplyPatch drm-nouveau.patch
@@ -1921,6 +1923,9 @@
%kernel_variant_files -k vmlinux %{with_kdump} kdump
%changelog
+* Tue Nov 18 2008 Dave Airlie <airlied at redhat.com> 2.6.27.5-116
+- rebase to intel proper set of patches + test patch fix.
+
* Mon Nov 17 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.5-115
- Fix missing parens in the cdrom-door-status patch.
- Previous message: rpms/iproute/F-8 iproute-2.6.26-ip-abbreviation.patch, NONE, 1.1 iproute.spec, 1.72, 1.73
- Next message: rpms/gnome-power-manager/devel gpm-use-sm-dbus-rather-than-libgnome.patch, NONE, 1.1 .cvsignore, 1.50, 1.51 gnome-power-manager.spec, 1.134, 1.135 sources, 1.50, 1.51 default-privs.patch, 1.1, NONE gpm-fix-buttons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list