Commit f68aeae6 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/cirrus: Use drm_fb_helper_fill_info 



Should not result in any changes.

v2: Rebase

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: Gerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326132008.11781-7-daniel.vetter@ffwll.ch
parent 2f5791cd

drivers/gpu/drm/cirrus/cirrus_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ struct cirrus_device { 




struct cirrus_fbdev {

	struct drm_fb_helper helper;

	struct drm_fb_helper helper; /* must be first */

	struct drm_framebuffer *gfb;

	void *sysram;

	int size;

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+1 −7
Original line number Diff line number Diff line
@@ -195,8 +195,6 @@ static int cirrusfb_create(struct drm_fb_helper *helper, 
		goto err_vfree;

	}



	info->par = gfbdev;



	fb = kzalloc(sizeof(*fb), GFP_KERNEL);

	if (!fb) {

		ret = -ENOMEM;
@@ -214,13 +212,9 @@ static int cirrusfb_create(struct drm_fb_helper *helper, 
	/* setup helper */

	gfbdev->helper.fb = fb;



	strcpy(info->fix.id, "cirrusdrmfb");



	info->fbops = &cirrusfb_ops;



	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);

	drm_fb_helper_fill_var(info, &gfbdev->helper, sizes->fb_width,

			       sizes->fb_height);

	drm_fb_helper_fill_info(info, &gfbdev->helper, sizes);



	/* setup aperture base/size for vesafb takeover */

	info->apertures->ranges[0].base = cdev->dev->mode_config.fb_base;