| Message ID | 20190326132008.11781-12-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/21] drm/fb-helper: Add fill_info() functions | expand |
Den 26.03.2019 14.19, skrev Daniel Vetter: > Should not result in any changes. It changes the name, so: Only changes the name of the fb from "mgadrmfb" to "mga200drmfb". Acked-by: Noralf Trønnes <noralf@tronnes.org> > > v2: Rebase > > Signed-off-by: Daniel 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> > --- > drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- > drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +------- > 2 files changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h > index 0aaedc554879..71a235c2d848 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_drv.h > +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h > @@ -113,7 +113,7 @@ struct mga_framebuffer { > }; > > struct mga_fbdev { > - struct drm_fb_helper helper; > + struct drm_fb_helper helper; /* must be first */ > struct mga_framebuffer mfb; > void *sysram; > int size; > diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c > index 6893934b26c0..5b7e64cac004 100644 > --- a/drivers/gpu/drm/mgag200/mgag200_fb.c > +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c > @@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, > goto err_alloc_fbi; > } > > - info->par = mfbdev; > - > ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); > if (ret) > goto err_alloc_fbi; > @@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper, > /* setup helper */ > mfbdev->helper.fb = fb; > > - strcpy(info->fix.id, "mgadrmfb"); > - > info->fbops = &mgag200fb_ops; > > /* setup aperture base/size for vesafb takeover */ > info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base; > 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_var(info, &mfbdev->helper, sizes->fb_width, > - sizes->fb_height); > + drm_fb_helper_fill_info(info, &mfbdev->helper, sizes); > > info->screen_base = sysram; > info->screen_size = size; >
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index 0aaedc554879..71a235c2d848 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h @@ -113,7 +113,7 @@ struct mga_framebuffer { }; struct mga_fbdev { - struct drm_fb_helper helper; + struct drm_fb_helper helper; /* must be first */ struct mga_framebuffer mfb; void *sysram; int size; diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 6893934b26c0..5b7e64cac004 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -195,8 +195,6 @@ static int mgag200fb_create(struct drm_fb_helper *helper, goto err_alloc_fbi; } - info->par = mfbdev; - ret = mgag200_framebuffer_init(dev, &mfbdev->mfb, &mode_cmd, gobj); if (ret) goto err_alloc_fbi; @@ -209,17 +207,13 @@ static int mgag200fb_create(struct drm_fb_helper *helper, /* setup helper */ mfbdev->helper.fb = fb; - strcpy(info->fix.id, "mgadrmfb"); - info->fbops = &mgag200fb_ops; /* setup aperture base/size for vesafb takeover */ info->apertures->ranges[0].base = mdev->dev->mode_config.fb_base; 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_var(info, &mfbdev->helper, sizes->fb_width, - sizes->fb_height); + drm_fb_helper_fill_info(info, &mfbdev->helper, sizes); info->screen_base = sysram; info->screen_size = size;
Should not result in any changes. v2: Rebase Signed-off-by: Daniel 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> --- drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-)