diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2022-06-01 13:25:14 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-06-07 09:39:44 +0200 |
| commit | 85397f6bc4ff13a6bc5259facb8ebebb1986d666 (patch) | |
| tree | 459762d6ff277aae8506efe330425230c6122c25 /drivers/gpu/drm/mgag200/mgag200_mode.c | |
| parent | drm/mgag200: Remove special case for G200SE with <2 MiB (diff) | |
| download | linux-85397f6bc4ff13a6bc5259facb8ebebb1986d666.tar.xz linux-85397f6bc4ff13a6bc5259facb8ebebb1986d666.zip | |
drm/mgag200: Initialize each model in separate function
Add a separate initializer function for each model. Add separate
devic structures for G200 and G200SE, which require additional
information.
Also move G200's and G200SE's helpers for reading the BIOS and
version id into model-specific code.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Tested-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220601112522.5774-3-tzimmermann@suse.de
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_mode.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_mode.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 8cb72e11a2ea..2b034255a4af 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -583,13 +583,13 @@ static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev, const struct drm_display_mode *mode, const struct drm_framebuffer *fb) { - u32 unique_rev_id = mdev->model.g200se.unique_rev_id; + struct mgag200_g200se_device *g200se = to_mgag200_g200se_device(&mdev->base); unsigned int hiprilvl; u8 crtcext6; - if (unique_rev_id >= 0x04) { + if (g200se->unique_rev_id >= 0x04) { hiprilvl = 0; - } else if (unique_rev_id >= 0x02) { + } else if (g200se->unique_rev_id >= 0x02) { unsigned int bpp; unsigned long mb; @@ -614,7 +614,7 @@ static void mgag200_g200se_set_hiprilvl(struct mga_device *mdev, else hiprilvl = 5; - } else if (unique_rev_id >= 0x01) { + } else if (g200se->unique_rev_id >= 0x01) { hiprilvl = 3; } else { hiprilvl = 4; @@ -725,17 +725,19 @@ static enum drm_mode_status mgag200_simple_display_pipe_mode_valid(struct drm_simple_display_pipe *pipe, const struct drm_display_mode *mode) { - struct mga_device *mdev = to_mga_device(pipe->crtc.dev); + struct drm_device *dev = pipe->crtc.dev; + struct mga_device *mdev = to_mga_device(dev); + struct mgag200_g200se_device *g200se; if (IS_G200_SE(mdev)) { - u32 unique_rev_id = mdev->model.g200se.unique_rev_id; + g200se = to_mgag200_g200se_device(dev); - if (unique_rev_id == 0x01) { + if (g200se->unique_rev_id == 0x01) { if (mode->hdisplay > 1600) return MODE_VIRTUAL_X; if (mode->vdisplay > 1200) return MODE_VIRTUAL_Y; - } else if (unique_rev_id == 0x02) { + } else if (g200se->unique_rev_id == 0x02) { if (mode->hdisplay > 1920) return MODE_VIRTUAL_X; if (mode->vdisplay > 1200) @@ -1026,6 +1028,7 @@ static enum drm_mode_status mgag200_mode_config_mode_valid(struct drm_device *de static const unsigned int max_bpp = 4; // DRM_FORMAT_XRGB8888 struct mga_device *mdev = to_mga_device(dev); unsigned long fbsize, fbpages, max_fbpages; + struct mgag200_g200se_device *g200se; max_fbpages = mdev->vram_fb_available >> PAGE_SHIFT; @@ -1036,12 +1039,12 @@ static enum drm_mode_status mgag200_mode_config_mode_valid(struct drm_device *de return MODE_MEM; if (IS_G200_SE(mdev)) { - u32 unique_rev_id = mdev->model.g200se.unique_rev_id; + g200se = to_mgag200_g200se_device(dev); - if (unique_rev_id == 0x01) { + if (g200se->unique_rev_id == 0x01) { if (mgag200_calculate_mode_bandwidth(mode, max_bpp * 8) > (24400 * 1024)) return MODE_BAD; - } else if (unique_rev_id == 0x02) { + } else if (g200se->unique_rev_id == 0x02) { if (mgag200_calculate_mode_bandwidth(mode, max_bpp * 8) > (30100 * 1024)) return MODE_BAD; } else { |