summaryrefslogtreecommitdiffstats
path: root/patches/debian/dfsg/drivers-gpu-drm-r128-disable.patch
blob: 8e04010102206602f506f961a472f903c0b4a3f5 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
From 2765959b3b6f56ada99e770c1001861a5de2d1b7 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Wed, 15 Oct 2008 00:40:17 +0100
Subject: [PATCH 01/24] r128: Add #ifdef markers around firmware and mark broken

---
 drivers/gpu/drm/Kconfig         |    1 +
 drivers/gpu/drm/r128/r128_cce.c |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index a8b33c2..725f244 100644
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -26,6 +26,7 @@ config DRM_TDFX
 config DRM_R128
 	tristate "ATI Rage 128"
 	depends on DRM && PCI
+	depends on BROKEN
 	help
 	  Choose this option if you have an ATI Rage 128 graphics card.  If M
 	  is selected, the module will be called r128.  AGP support for
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
index c31afbd..04d8358 100644
--- a/drivers/gpu/drm/r128/r128_cce.c
+++ b/drivers/gpu/drm/r128/r128_cce.c
@@ -36,6 +36,7 @@
 
 #define R128_FIFO_DEBUG		0
 
+#ifdef REMOVE_DFSG
 /* CCE microcode (from ATI) */
 static u32 r128_cce_microcode[] = {
 	0, 276838400, 0, 268449792, 2, 142, 2, 145, 0, 1076765731, 0,
@@ -80,6 +81,7 @@ static u32 r128_cce_microcode[] = {
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
+#endif /* REMOVE_DFSG */
 
 static int R128_READ_PLL(struct drm_device * dev, int addr)
 {
-- 
1.6.1.3