[PATCH 3/4] drm/gma500: Don't store crtc_funcs in psb_ops

[Thomas Zimmermann]

Am 17.03.22 um 10:25 schrieb Patrik Jakobsson:
> The drm_crtc_funcs are all generic and no chip specific functions are
> necessary. We can therefore directly put gma_crtc_funcs into the
> drm_crtc.
> 
> Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson at gmail.com>

Reviewed-by: Thomas Zimmermann <tzimmermann at suse.de>

> ---
>   drivers/gpu/drm/gma500/cdv_device.c        | 1 -
>   drivers/gpu/drm/gma500/oaktrail_device.c   | 1 -
>   drivers/gpu/drm/gma500/psb_device.c        | 1 -
>   drivers/gpu/drm/gma500/psb_drv.h           | 1 -
>   drivers/gpu/drm/gma500/psb_intel_display.c | 3 +--
>   5 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
> index 887c157d75f4..f854f58bcbb3 100644
> --- a/drivers/gpu/drm/gma500/cdv_device.c
> +++ b/drivers/gpu/drm/gma500/cdv_device.c
> @@ -603,7 +603,6 @@ const struct psb_ops cdv_chip_ops = {
>   	.errata = cdv_errata,
>   
>   	.crtc_helper = &cdv_intel_helper_funcs,
> -	.crtc_funcs = &gma_crtc_funcs,
>   	.clock_funcs = &cdv_clock_funcs,
>   
>   	.output_init = cdv_output_init,
> diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
> index 40f1bc736125..5923a9c89312 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_device.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_device.c
> @@ -545,7 +545,6 @@ const struct psb_ops oaktrail_chip_ops = {
>   	.chip_setup = oaktrail_chip_setup,
>   	.chip_teardown = oaktrail_teardown,
>   	.crtc_helper = &oaktrail_helper_funcs,
> -	.crtc_funcs = &gma_crtc_funcs,
>   
>   	.output_init = oaktrail_output_init,
>   
> diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c
> index e93e4191c0ca..59f325165667 100644
> --- a/drivers/gpu/drm/gma500/psb_device.c
> +++ b/drivers/gpu/drm/gma500/psb_device.c
> @@ -329,7 +329,6 @@ const struct psb_ops psb_chip_ops = {
>   	.chip_teardown = psb_chip_teardown,
>   
>   	.crtc_helper = &psb_intel_helper_funcs,
> -	.crtc_funcs = &gma_crtc_funcs,
>   	.clock_funcs = &psb_clock_funcs,
>   
>   	.output_init = psb_output_init,
> diff --git a/drivers/gpu/drm/gma500/psb_drv.h b/drivers/gpu/drm/gma500/psb_drv.h
> index 88f44dbbc4eb..aed167af13c5 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_drv.h
> @@ -578,7 +578,6 @@ struct psb_ops {
>   
>   	/* Sub functions */
>   	struct drm_crtc_helper_funcs const *crtc_helper;
> -	struct drm_crtc_funcs const *crtc_funcs;
>   	const struct gma_clock_funcs *clock_funcs;
>   
>   	/* Setup hooks */
> diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
> index 6df62fe7c1e0..a99859b5b13a 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_display.c
> +++ b/drivers/gpu/drm/gma500/psb_intel_display.c
> @@ -488,8 +488,7 @@ void psb_intel_crtc_init(struct drm_device *dev, int pipe,
>   		return;
>   	}
>   
> -	/* Set the CRTC operations from the chip specific data */
> -	drm_crtc_init(dev, &gma_crtc->base, dev_priv->ops->crtc_funcs);
> +	drm_crtc_init(dev, &gma_crtc->base, &gma_crtc_funcs);
>   
>   	/* Set the CRTC clock functions from chip specific data */
>   	gma_crtc->clock_funcs = dev_priv->ops->clock_funcs;

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Ivo Totev
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 840 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20220317/c0477e93/attachment.sig>