[Intel-gfx] [PATCH 06/21] drm/ast: Use drm_fb_helper_fill_info

[Noralf Trønnes]

Den 26.03.2019 14.19, skrev Daniel Vetter:
> Should not result in any changes.
> 
> v2: Rebase
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> Cc: Dave Airlie <airlied at redhat.com>
> Cc: Junwei Zhang <Jerry.Zhang at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: "Christian König" <christian.koenig at amd.com>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: Sean Paul <sean at poorly.run>
> Cc: YueHaibing <yuehaibing at huawei.com>
> Cc: Sam Bobroff <sbobroff at linux.ibm.com>
> ---
>  drivers/gpu/drm/ast/ast_drv.h | 2 +-
>  drivers/gpu/drm/ast/ast_fb.c  | 7 +------
>  2 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
> index bfc65040dfcb..ffce4608e0c5 100644
> --- a/drivers/gpu/drm/ast/ast_drv.h
> +++ b/drivers/gpu/drm/ast/ast_drv.h
> @@ -259,7 +259,7 @@ struct ast_framebuffer {
>  };
>  
>  struct ast_fbdev {
> -	struct drm_fb_helper helper;
> +	struct drm_fb_helper helper; /* must be first */

I think being implicit like this is confusing.
I would prefer to set 'info->par = afbdev;' after calling
drm_fb_helper_fill_info().

But it works and the pattern is used elsewhere:

Acked-by: Noralf Trønnes <noralf at tronnes.org>

>  	struct ast_framebuffer afb;
>  	void *sysram;
>  	int size;
> diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
> index 2c9f8dd9733a..e718d0f60d6b 100644
> --- a/drivers/gpu/drm/ast/ast_fb.c
> +++ b/drivers/gpu/drm/ast/ast_fb.c
> @@ -217,8 +217,6 @@ static int astfb_create(struct drm_fb_helper *helper,
>  		ret = PTR_ERR(info);
>  		goto out;
>  	}
> -	info->par = afbdev;
> -
>  	ret = ast_framebuffer_init(dev, &afbdev->afb, &mode_cmd, gobj);
>  	if (ret)
>  		goto out;
> @@ -229,15 +227,12 @@ static int astfb_create(struct drm_fb_helper *helper,
>  	fb = &afbdev->afb.base;
>  	afbdev->helper.fb = fb;
>  
> -	strcpy(info->fix.id, "astdrmfb");
> -
>  	info->fbops = &astfb_ops;
>  
>  	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
>  	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
>  
> -	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
> -	drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height);
> +	drm_fb_helper_fill_info(info, &afbdev->helper, sizes);
>  
>  	info->screen_base = sysram;
>  	info->screen_size = size;
>