leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/cirrus: Use drm_fb_helper_fill_info

Browse Source 
Should not result in any changes.

v2: Rebase

Acked-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326132008.11781-7-daniel.vetter@ffwll.ch
This commit is contained in:
Daniel Vetter 2019-03-26 14:19:54 +01:00
parent 2f5791cd03
commit f68aeae671
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/cirrus/cirrus_drv.h
View File

@ -143,7 +143,7 @@ struct cirrus_device {
struct cirrus_fbdev { struct cirrus_fbdev {
struct drm_fb_helper helper; struct drm_fb_helper helper; /* must be first */
struct drm_framebuffer *gfb; struct drm_framebuffer *gfb;
void *sysram; void *sysram;
int size; int size;

8
drivers/gpu/drm/cirrus/cirrus_fbdev.c
View File

@ -195,8 +195,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
goto err_vfree; goto err_vfree;
} }
info->par = gfbdev;
fb = kzalloc(sizeof(*fb), GFP_KERNEL); fb = kzalloc(sizeof(*fb), GFP_KERNEL);
if (!fb) { if (!fb) {
ret = -ENOMEM; ret = -ENOMEM;
@ -214,13 +212,9 @@ static int cirrusfb_create(struct drm_fb_helper *helper,
/* setup helper */ /* setup helper */
gfbdev->helper.fb = fb; gfbdev->helper.fb = fb;
strcpy(info->fix.id, "cirrusdrmfb");
info->fbops = &cirrusfb_ops; info->fbops = &cirrusfb_ops;
drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth); drm_fb_helper_fill_info(info, &gfbdev->helper, sizes);
drm_fb_helper_fill_var(info, &gfbdev->helper, sizes->fb_width,
sizes->fb_height);
/* setup aperture base/size for vesafb takeover */ /* setup aperture base/size for vesafb takeover */
info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base; info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base;