Message ID | 20190326132008.11781-5-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: > Only changes the name of the fb from "armada-drmfb" to armadafb. armadafb -> armadadrmfb > > v2: Rebase > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Russell King <linux@armlinux.org.uk> > --- Reviewed-by: Noralf Trønnes <noralf@tronnes.org> > drivers/gpu/drm/armada/armada_fbdev.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c > index 8d23700848df..1e7140f005a5 100644 > --- a/drivers/gpu/drm/armada/armada_fbdev.c > +++ b/drivers/gpu/drm/armada/armada_fbdev.c > @@ -78,8 +78,6 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, > goto err_fballoc; > } > > - strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); > - info->par = fbh; > info->fbops = &armada_fb_ops; > info->fix.smem_start = obj->phys_addr; > info->fix.smem_len = obj->obj.size; > @@ -87,9 +85,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, > info->screen_base = ptr; > fbh->fb = &dfb->fb; > > - drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], > - dfb->fb.format->depth); > - drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height); > + drm_fb_helper_fill_info(info, fbh, sizes); > > DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n", > dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8, >
diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index 8d23700848df..1e7140f005a5 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -78,8 +78,6 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, goto err_fballoc; } - strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id)); - info->par = fbh; info->fbops = &armada_fb_ops; info->fix.smem_start = obj->phys_addr; info->fix.smem_len = obj->obj.size; @@ -87,9 +85,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, info->screen_base = ptr; fbh->fb = &dfb->fb; - drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], - dfb->fb.format->depth); - drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height); + drm_fb_helper_fill_info(info, fbh, sizes); DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n", dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8,
Only changes the name of the fb from "armada-drmfb" to armadafb. v2: Rebase Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Russell King <linux@armlinux.org.uk> --- drivers/gpu/drm/armada/armada_fbdev.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)