Commit fb724f1e authored by Thomas Zimmermann's avatar Thomas Zimmermann

drm/mgag200: Clean up mga_crtc_do_set_base()

The function now only takes the device structure, and the old and new
framebuffers.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Tested-by: default avatarJohn Donnelly <John.p.donnelly@oracle.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200515083233.32036-4-tzimmermann@suse.de
parent d6237687
...@@ -861,21 +861,20 @@ static void mgag200_set_startadd(struct mga_device *mdev, ...@@ -861,21 +861,20 @@ static void mgag200_set_startadd(struct mga_device *mdev,
WREG_ECRT(0x00, crtcext0); WREG_ECRT(0x00, crtcext0);
} }
static int mga_crtc_do_set_base(struct drm_crtc *crtc, static int mga_crtc_do_set_base(struct mga_device *mdev,
struct drm_framebuffer *fb, const struct drm_framebuffer *fb,
int x, int y, int atomic) const struct drm_framebuffer *old_fb)
{ {
struct mga_device *mdev = to_mga_device(crtc->dev);
struct drm_gem_vram_object *gbo; struct drm_gem_vram_object *gbo;
int ret; int ret;
s64 gpu_addr; s64 gpu_addr;
if (!atomic && fb) { if (old_fb) {
gbo = drm_gem_vram_of_gem(fb->obj[0]); gbo = drm_gem_vram_of_gem(old_fb->obj[0]);
drm_gem_vram_unpin(gbo); drm_gem_vram_unpin(gbo);
} }
gbo = drm_gem_vram_of_gem(crtc->primary->fb->obj[0]); gbo = drm_gem_vram_of_gem(fb->obj[0]);
ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM); ret = drm_gem_vram_pin(gbo, DRM_GEM_VRAM_PL_FLAG_VRAM);
if (ret) if (ret)
...@@ -900,6 +899,7 @@ static int mga_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, ...@@ -900,6 +899,7 @@ static int mga_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
{ {
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
struct mga_device *mdev = dev->dev_private; struct mga_device *mdev = dev->dev_private;
struct drm_framebuffer *fb = crtc->primary->fb;
unsigned int count; unsigned int count;
do { } while (RREG8(0x1fda) & 0x08); do { } while (RREG8(0x1fda) & 0x08);
...@@ -908,7 +908,7 @@ static int mga_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, ...@@ -908,7 +908,7 @@ static int mga_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
count = RREG8(MGAREG_VCOUNT) + 2; count = RREG8(MGAREG_VCOUNT) + 2;
do { } while (RREG8(MGAREG_VCOUNT) < count); do { } while (RREG8(MGAREG_VCOUNT) < count);
return mga_crtc_do_set_base(crtc, old_fb, x, y, 0); return mga_crtc_do_set_base(mdev, fb, old_fb);
} }
static int mga_crtc_mode_set(struct drm_crtc *crtc, static int mga_crtc_mode_set(struct drm_crtc *crtc,
...@@ -1150,7 +1150,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc, ...@@ -1150,7 +1150,7 @@ static int mga_crtc_mode_set(struct drm_crtc *crtc,
WREG8(MGA_MISC_OUT, misc); WREG8(MGA_MISC_OUT, misc);
mga_crtc_do_set_base(crtc, old_fb, x, y, 0); mga_crtc_do_set_base(mdev, fb, old_fb);
/* reset tagfifo */ /* reset tagfifo */
if (mdev->type == G200_ER) { if (mdev->type == G200_ER) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment