Skip to content

Commit

Permalink
drm/mgag200: Move ER/EW3 register initialization to per-model code
Browse files Browse the repository at this point in the history
The register initialization code contains special cases for G200ER
and G200EW3 hardware. Move this to per-model code.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Jocelyn Falempe <jfalempe@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220728124103.30159-4-tzimmermann@suse.de
  • Loading branch information
Thomas Zimmermann committed Jul 29, 2022
1 parent 1ee181f commit 9382ec2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/mgag200/mgag200_g200er.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ static void mgag200_g200er_init_registers(struct mga_device *mdev)
WREG_DAC(0x90, 0); /* G200ER specific */

mgag200_init_registers(mdev);

WREG_ECRT(0x24, 0x5); /* G200ER specific */
}

/*
Expand Down
9 changes: 8 additions & 1 deletion drivers/gpu/drm/mgag200/mgag200_g200ew3.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@

#include "mgag200_drv.h"

static void mgag200_g200ew3_init_registers(struct mga_device *mdev)
{
mgag200_g200wb_init_registers(mdev); // same as G200WB

WREG_ECRT(0x34, 0x5); // G200EW3 specific
}

/*
* DRM device
*/
Expand Down Expand Up @@ -50,7 +57,7 @@ struct mga_device *mgag200_g200ew3_device_create(struct pci_dev *pdev,
if (ret)
return ERR_PTR(ret);

mgag200_g200wb_init_registers(mdev); // same as G200WB
mgag200_g200ew3_init_registers(mdev);

vram_available = mgag200_g200ew3_device_probe_vram(mdev);

Expand Down
6 changes: 0 additions & 6 deletions drivers/gpu/drm/mgag200/mgag200_mode.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,12 +287,6 @@ void mgag200_init_registers(struct mga_device *mdev)
MGAREG_CRTC11_VINTCLR);
WREG_CRT(0x11, crtc11);

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

if (mdev->type == G200_EW3)
WREG_ECRT(0x34, 0x5);

misc = RREG8(MGA_MISC_IN);
misc |= MGAREG_MISC_IOADSEL;
WREG8(MGA_MISC_OUT, misc);
Expand Down

0 comments on commit 9382ec2

Please sign in to comment.