lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroxfb: get rid of CONFIG_FB_MATROX_32MB

Browse Source 
CONFIG_FB_MATROX_32MB is always enabled, so there is no point in having
ifdefs all around.  And it is bad practice to use CONFIG_* as a name for
something which is not a Kconfig option.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Petr Vandrovec <vandrove@vc.cvut.cz>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jean Delvare
2009-09-22 16:47:50 -07:00
committed by Linus Torvalds
parent ee5a274979
commit a690606d1f
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/video/matrox/matroxfb_DAC1064.c
View File

@@ -1080,10 +1080,8 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
DAC1064_restore_1(minfo); DAC1064_restore_1(minfo);
matroxfb_vgaHWrestore(minfo); matroxfb_vgaHWrestore(minfo);
#ifdef CONFIG_FB_MATROX_32MB
if (minfo->devflags.support32MB) if (minfo->devflags.support32MB)
mga_setr(M_EXTVGA_INDEX, 8, hw->CRTCEXT[8]); mga_setr(M_EXTVGA_INDEX, 8, hw->CRTCEXT[8]);
#endif
minfo->crtc1.panpos = -1; minfo->crtc1.panpos = -1;
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]); mga_setr(M_EXTVGA_INDEX, i, hw->CRTCEXT[i]);

12
drivers/video/matrox/matroxfb_base.c
View File

@@ -310,9 +310,7 @@ static void matrox_pan_var(struct matrox_fb_info *minfo,
{ {
unsigned int pos; unsigned int pos;
unsigned short p0, p1, p2; unsigned short p0, p1, p2;
#ifdef CONFIG_FB_MATROX_32MB
unsigned int p3; unsigned int p3;
#endif
int vbl; int vbl;
unsigned long flags; unsigned long flags;
@@ -330,9 +328,7 @@ static void matrox_pan_var(struct matrox_fb_info *minfo,
p0 = minfo->hw.CRTC[0x0D] = pos & 0xFF; p0 = minfo->hw.CRTC[0x0D] = pos & 0xFF;
p1 = minfo->hw.CRTC[0x0C] = (pos & 0xFF00) >> 8; p1 = minfo->hw.CRTC[0x0C] = (pos & 0xFF00) >> 8;
p2 = minfo->hw.CRTCEXT[0] = (minfo->hw.CRTCEXT[0] & 0xB0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40); p2 = minfo->hw.CRTCEXT[0] = (minfo->hw.CRTCEXT[0] & 0xB0) | ((pos >> 16) & 0x0F) | ((pos >> 14) & 0x40);
#ifdef CONFIG_FB_MATROX_32MB
p3 = minfo->hw.CRTCEXT[8] = pos >> 21; p3 = minfo->hw.CRTCEXT[8] = pos >> 21;
#endif
/* FB_ACTIVATE_VBL and we can acquire interrupts? Honor FB_ACTIVATE_VBL then... */ /* FB_ACTIVATE_VBL and we can acquire interrupts? Honor FB_ACTIVATE_VBL then... */
vbl = (var->activate & FB_ACTIVATE_VBL) && (matroxfb_enable_irq(minfo, 0) == 0); vbl = (var->activate & FB_ACTIVATE_VBL) && (matroxfb_enable_irq(minfo, 0) == 0);
@@ -342,10 +338,8 @@ static void matrox_pan_var(struct matrox_fb_info *minfo,
matroxfb_DAC_lock_irqsave(flags); matroxfb_DAC_lock_irqsave(flags);
mga_setr(M_CRTC_INDEX, 0x0D, p0); mga_setr(M_CRTC_INDEX, 0x0D, p0);
mga_setr(M_CRTC_INDEX, 0x0C, p1); mga_setr(M_CRTC_INDEX, 0x0C, p1);
#ifdef CONFIG_FB_MATROX_32MB
if (minfo->devflags.support32MB) if (minfo->devflags.support32MB)
mga_setr(M_EXTVGA_INDEX, 0x08, p3); mga_setr(M_EXTVGA_INDEX, 0x08, p3);
#endif
if (vbl) { if (vbl) {
minfo->crtc1.panpos = p2; minfo->crtc1.panpos = p2;
} else { } else {
@@ -1360,13 +1354,9 @@ static struct video_board vbMystique = {0x0800000, 0x0800000, FB_ACCEL_MATROX_M
#ifdef CONFIG_FB_MATROX_G #ifdef CONFIG_FB_MATROX_G
static struct video_board vbG100 = {0x0800000, 0x0800000, FB_ACCEL_MATROX_MGAG100, &matrox_G100}; static struct video_board vbG100 = {0x0800000, 0x0800000, FB_ACCEL_MATROX_MGAG100, &matrox_G100};
static struct video_board vbG200 = {0x1000000, 0x1000000, FB_ACCEL_MATROX_MGAG200, &matrox_G100}; static struct video_board vbG200 = {0x1000000, 0x1000000, FB_ACCEL_MATROX_MGAG200, &matrox_G100};
#ifdef CONFIG_FB_MATROX_32MB
/* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for /* from doc it looks like that accelerator can draw only to low 16MB :-( Direct accesses & displaying are OK for
whole 32MB */ whole 32MB */
static struct video_board vbG400 = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400, &matrox_G100}; static struct video_board vbG400 = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400, &matrox_G100};
#else
static struct video_board vbG400 = {0x2000000, 0x1000000, FB_ACCEL_MATROX_MGAG400, &matrox_G100};
#endif
#endif #endif
#define DEVF_VIDEO64BIT 0x0001 #define DEVF_VIDEO64BIT 0x0001
@@ -1646,9 +1636,7 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
minfo->devflags.textmode = 1; minfo->devflags.textmode = 1;
minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP8; minfo->devflags.text_type_aux = FB_AUX_TEXT_MGA_STEP8;
} }
#ifdef CONFIG_FB_MATROX_32MB
minfo->devflags.support32MB = (b->flags & DEVF_SUPPORT32MB) != 0; minfo->devflags.support32MB = (b->flags & DEVF_SUPPORT32MB) != 0;
#endif
minfo->devflags.precise_width = !(b->flags & DEVF_ANY_VXRES); minfo->devflags.precise_width = !(b->flags & DEVF_ANY_VXRES);
minfo->devflags.crtc2 = (b->flags & DEVF_CRTC2) != 0; minfo->devflags.crtc2 = (b->flags & DEVF_CRTC2) != 0;
minfo->devflags.maven_capable = (b->flags & DEVF_MAVEN_CAPABLE) != 0; minfo->devflags.maven_capable = (b->flags & DEVF_MAVEN_CAPABLE) != 0;

5
drivers/video/matrox/matroxfb_base.h
View File

@@ -54,9 +54,6 @@
#include "../macmodes.h" #include "../macmodes.h"
#endif #endif
/* always compile support for 32MB... It cost almost nothing */
#define CONFIG_FB_MATROX_32MB
#ifdef MATROXFB_DEBUG #ifdef MATROXFB_DEBUG
#define DEBUG #define DEBUG
@@ -464,9 +461,7 @@ struct matrox_fb_info {
int nopciretry; int nopciretry;
int noinit; int noinit;
int sgram; int sgram;
#ifdef CONFIG_FB_MATROX_32MB
int support32MB; int support32MB;
#endif
int accelerator; int accelerator;
int text_type_aux; int text_type_aux;