Skip to content

Commit

Permalink
drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not de…
Browse files Browse the repository at this point in the history
…cimal.

This change properly enables the "requester" in G200ER cards that is
responsible for getting pixels out of memory and clocking them out to
the screen.

Signed-off-by: Christopher Harvey <charvey@matrox.com>
Cc: stable@vger.kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Christopher Harvey authored and Dave Airlie committed Apr 9, 2013
1 parent c9cdee1 commit 1812a3d
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions drivers/gpu/drm/mgag200/mgag200_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
int i;
unsigned char misc = 0;
unsigned char ext_vga[6];
unsigned char ext_vga_index24;
unsigned char dac_index90 = 0;
u8 bppshift;

static unsigned char dacvalue[] = {
Expand Down Expand Up @@ -803,7 +801,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
option2 = 0x0000b000;
break;
case G200_ER:
dac_index90 = 0;
break;
}

Expand Down Expand Up @@ -852,10 +849,8 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
WREG_DAC(i, dacvalue[i]);
}

if (mdev->type == G200_ER) {
WREG_DAC(0x90, dac_index90);
}

if (mdev->type == G200_ER)
WREG_DAC(0x90, 0);

if (option)
pci_write_config_dword(dev->pdev, PCI_MGA_OPTION, option);
Expand Down Expand Up @@ -952,8 +947,6 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
if (mdev->type == G200_WB)
ext_vga[1] |= 0x88;

ext_vga_index24 = 0x05;

/* Set pixel clocks */
misc = 0x2d;
WREG8(MGA_MISC_OUT, misc);
Expand All @@ -965,7 +958,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
}

if (mdev->type == G200_ER)
WREG_ECRT(24, ext_vga_index24);
WREG_ECRT(0x24, 0x5);

if (mdev->type == G200_EV) {
WREG_ECRT(6, 0);
Expand Down

0 comments on commit 1812a3d

Please sign in to comment.