Commit 82367d80 authored by Daniel Vetter's avatar Daniel Vetter

drm/mga200g: Use drm_fb_helper_fill_info

Only changes the name of the fb from "mgadrmfb" to "mga200drmfb".

v2: Rebase

v3: Note the name change (Noralf)
Acked-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: Junwei Zhang <Jerry.Zhang@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326132008.11781-12-daniel.vetter@ffwll.ch
parent 7a0f9ef9
...@@ -113,7 +113,7 @@ struct mga_framebuffer { ...@@ -113,7 +113,7 @@ struct mga_framebuffer {
}; };
struct mga_fbdev { struct mga_fbdev {
struct drm_fb_helper helper; struct drm_fb_helper helper; /* must be first */
struct mga_framebuffer mfb; struct mga_framebuffer mfb;
void *sysram; void *sysram;
int size; int size;
......
...@@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, ...@@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
goto err_alloc_fbi; goto err_alloc_fbi;
} }
info->par = mfbdev;
ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj);
if (ret) if (ret)
goto err_alloc_fbi; goto err_alloc_fbi;
...@@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper, ...@@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper,
/* setup helper */ /* setup helper */
mfbdev->helper.fb = fb; mfbdev->helper.fb = fb;
strcpy(info->fix.id, "mgadrmfb");
info->fbops = &mgag200fb_ops; info->fbops = &mgag200fb_ops;
/* setup aperture base/size for vesafb takeover */ /* setup aperture base/size for vesafb takeover */
info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base; info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base;
info->apertures->ranges[0].size = mdev->mc.vram_size; info->apertures->ranges[0].size = mdev->mc.vram_size;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_info(info, &mfbdev->helper, sizes);
drm_fb_helper_fill_var(info, &mfbdev->helper, sizes->fb_width,
sizes->fb_height);
info->screen_base = sysram; info->screen_base = sysram;
info->screen_size = size; info->screen_size = size;
......
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