diff options
| author |   Thomas Zimmermann <tzimmermann@suse.de> | 2022-06-01 13:25:16 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-06-07 09:39:51 +0200 |
| commit | d45e32c9d98ce7c22a4bafe69cee58165b59533b (patch) | |
| tree | 0479e9f3cb16036722eb011b6c73c192530b5a35 /drivers/gpu/drm/mgag200/mgag200_mode.c | |
| parent | drm/mgag200: Move PCI-option setup into model-specific code (diff) | |
| download | linux-d45e32c9d98ce7c22a4bafe69cee58165b59533b.tar.xz linux-d45e32c9d98ce7c22a4bafe69cee58165b59533b.zip | |
drm/mgag200: Call mgag200_device_probe_vram() from per-model init
Call mgag200_device_probe_vram() from each model's initializer. The
G200EW3 uses a special helper with additional instructions.
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-5-tzimmermann@suse.de
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_mode.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_mode.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_mode.c b/drivers/gpu/drm/mgag200/mgag200_mode.c index 2b034255a4af..c254988e5bcb 100644 --- a/drivers/gpu/drm/mgag200/mgag200_mode.c +++ b/drivers/gpu/drm/mgag200/mgag200_mode.c @@ -32,6 +32,11 @@ * This file contains setup code for the CRTC. */ +resource_size_t mgag200_device_probe_vram(struct mga_device *mdev) +{ + return mgag200_probe_vram(mdev->vram, mdev->mc.vram_size); +} + static void mgag200_crtc_set_gamma_linear(struct mga_device *mdev, const struct drm_format_info *format) { @@ -1030,7 +1035,7 @@ static enum drm_mode_status mgag200_mode_config_mode_valid(struct drm_device *de unsigned long fbsize, fbpages, max_fbpages; struct mgag200_g200se_device *g200se; - max_fbpages = mdev->vram_fb_available >> PAGE_SHIFT; + max_fbpages = mdev->vram_available >> PAGE_SHIFT; fbsize = mode->hdisplay * mode->vdisplay * max_bpp; fbpages = DIV_ROUND_UP(fbsize, PAGE_SIZE); @@ -1075,7 +1080,7 @@ static const struct drm_mode_config_funcs mgag200_mode_config_funcs = { .atomic_commit = drm_atomic_helper_commit, }; -int mgag200_modeset_init(struct mga_device *mdev) +int mgag200_modeset_init(struct mga_device *mdev, resource_size_t vram_available) { struct drm_device *dev = &mdev->base; struct mga_i2c_chan *i2c = &mdev->i2c; @@ -1086,6 +1091,8 @@ int mgag200_modeset_init(struct mga_device *mdev) mgag200_init_regs(mdev); + mdev->vram_available = vram_available; + ret = drmm_mode_config_init(dev); if (ret) { drm_err(dev, "drmm_mode_config_init() failed, error %d\n", |