mga: remove unnecessary change from firmware-loading patch
svn path=/dists/trunk/linux-2.6/; revision=13843
This commit is contained in:
parent
c3fff7baed
commit
56f4a33b73
|
@ -1,7 +1,11 @@
|
|||
linux-2.6 (2.6.30-1~experimental.2) UNRELEASED; urgency=low
|
||||
|
||||
[ maximilian attems ]
|
||||
* [powerpc64] Enable modular RTC_DRV_PS3, PS3_VRAM.
|
||||
|
||||
[ Ben Hutchings ]
|
||||
* mga: remove unnecessary change from firmware-loading patch
|
||||
|
||||
-- maximilian attems <maks@debian.org> Thu, 18 Jun 2009 23:50:56 +0200
|
||||
|
||||
linux-2.6 (2.6.30-1) unstable; urgency=low
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
From 0175b4bdefff22f837203fd47f568c4647f24a4f Mon Sep 17 00:00:00 2001
|
||||
From: Ben Hutchings <ben@decadent.org.uk>
|
||||
Date: Sat, 18 Oct 2008 04:28:10 +0100
|
||||
Subject: [PATCH 18/24] mga: Use request_firmware() to load microcode
|
||||
Subject: mga: Use request_firmware() to load microcode
|
||||
|
||||
Image format is IHEX, one record for each pipe in order (record
|
||||
addresses are ignored).
|
||||
|
@ -277,19 +275,3 @@ index 651b93c..9aad484 100644
|
|||
}
|
||||
|
||||
#define WMISC_EXPECTED (MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
|
||||
diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
|
||||
index 944b50a..0b8fc27 100644
|
||||
--- a/include/drm/mga_drm.h
|
||||
+++ b/include/drm/mga_drm.h
|
||||
@@ -69,7 +69,7 @@
|
||||
#define MGA_MAX_G200_PIPES 8 /* no multitex */
|
||||
#define MGA_MAX_G400_PIPES 16
|
||||
#define MGA_MAX_WARP_PIPES MGA_MAX_G400_PIPES
|
||||
-#define MGA_WARP_UCODE_SIZE 32768 /* in bytes */
|
||||
+#define MGA_WARP_UCODE_SIZE 40960 /* in bytes */
|
||||
|
||||
#define MGA_CARD_TYPE_G200 1
|
||||
#define MGA_CARD_TYPE_G400 2
|
||||
--
|
||||
1.6.1.3
|
||||
|
||||
|
|
Loading…
Reference in New Issue