[PATCH 4/6] drm/gma500: Unify crtc helpers

[Thomas Zimmermann]

Am 01.02.21 um 14:26 schrieb Patrik Jakobsson:
> CDV crtc helpers are identical to other chips so use gma_ prefix for the
> crtc helper struct and remove the CDV copy.
> 
> 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        |  2 +-
>   drivers/gpu/drm/gma500/cdv_device.h        |  1 -
>   drivers/gpu/drm/gma500/cdv_intel_display.c | 12 ------------
>   drivers/gpu/drm/gma500/oaktrail_device.c   |  2 +-
>   drivers/gpu/drm/gma500/psb_device.c        |  2 +-
>   drivers/gpu/drm/gma500/psb_drv.h           |  2 +-
>   drivers/gpu/drm/gma500/psb_intel_display.c |  2 +-
>   7 files changed, 5 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
> index 19e055dbd4c2..1342e7fb382f 100644
> --- a/drivers/gpu/drm/gma500/cdv_device.c
> +++ b/drivers/gpu/drm/gma500/cdv_device.c
> @@ -603,7 +603,7 @@ const struct psb_ops cdv_chip_ops = {
>   	.errata = cdv_errata,
>   
>   	.crtc_helper = &cdv_intel_helper_funcs,
> -	.crtc_funcs = &cdv_intel_crtc_funcs,
> +	.crtc_funcs = &gma_intel_crtc_funcs,
>   	.clock_funcs = &cdv_clock_funcs,
>   
>   	.output_init = cdv_output_init,
> diff --git a/drivers/gpu/drm/gma500/cdv_device.h b/drivers/gpu/drm/gma500/cdv_device.h
> index 37e4bdc84c03..504d717385cd 100644
> --- a/drivers/gpu/drm/gma500/cdv_device.h
> +++ b/drivers/gpu/drm/gma500/cdv_device.h
> @@ -8,7 +8,6 @@ struct drm_device;
>   struct psb_intel_mode_device;
>   
>   extern const struct drm_crtc_helper_funcs cdv_intel_helper_funcs;
> -extern const struct drm_crtc_funcs cdv_intel_crtc_funcs;
>   extern const struct gma_clock_funcs cdv_clock_funcs;
>   extern void cdv_intel_crt_init(struct drm_device *dev,
>   			struct psb_intel_mode_device *mode_dev);
> diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
> index aac776fab36d..c3a9f6b3c848 100644
> --- a/drivers/gpu/drm/gma500/cdv_intel_display.c
> +++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
> @@ -961,18 +961,6 @@ const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {
>   	.disable = gma_crtc_disable,
>   };
>   
> -const struct drm_crtc_funcs cdv_intel_crtc_funcs = {
> -	.cursor_set = gma_crtc_cursor_set,
> -	.cursor_move = gma_crtc_cursor_move,
> -	.gamma_set = gma_crtc_gamma_set,
> -	.set_config = gma_crtc_set_config,
> -	.destroy = gma_crtc_destroy,
> -	.page_flip = gma_crtc_page_flip,
> -	.enable_vblank = psb_enable_vblank,
> -	.disable_vblank = psb_disable_vblank,
> -	.get_vblank_counter = psb_get_vblank_counter,
> -};
> -
>   const struct gma_clock_funcs cdv_clock_funcs = {
>   	.clock = cdv_intel_clock,
>   	.limit = cdv_intel_limit,
> diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
> index 08cd5f73c868..9650588c7223 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_device.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_device.c
> @@ -548,7 +548,7 @@ const struct psb_ops oaktrail_chip_ops = {
>   	.chip_setup = oaktrail_chip_setup,
>   	.chip_teardown = oaktrail_teardown,
>   	.crtc_helper = &oaktrail_helper_funcs,
> -	.crtc_funcs = &psb_intel_crtc_funcs,
> +	.crtc_funcs = &gma_intel_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 2d21f8ec595f..951725a0f7a3 100644
> --- a/drivers/gpu/drm/gma500/psb_device.c
> +++ b/drivers/gpu/drm/gma500/psb_device.c
> @@ -329,7 +329,7 @@ const struct psb_ops psb_chip_ops = {
>   	.chip_teardown = psb_chip_teardown,
>   
>   	.crtc_helper = &psb_intel_helper_funcs,
> -	.crtc_funcs = &psb_intel_crtc_funcs,
> +	.crtc_funcs = &gma_intel_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 d4f14a5d509b..697f64e0f2f4 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_drv.h
> @@ -672,7 +672,7 @@ extern void oaktrail_lvds_init(struct drm_device *dev,
>   
>   /* psb_intel_display.c */
>   extern const struct drm_crtc_helper_funcs psb_intel_helper_funcs;
> -extern const struct drm_crtc_funcs psb_intel_crtc_funcs;
> +extern const struct drm_crtc_funcs gma_intel_crtc_funcs;
>   
>   /* psb_intel_lvds.c */
>   extern const struct drm_connector_helper_funcs
> diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
> index 9c3cb1b80bbd..359606429316 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_display.c
> +++ b/drivers/gpu/drm/gma500/psb_intel_display.c
> @@ -426,7 +426,7 @@ const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
>   	.disable = gma_crtc_disable,
>   };
>   
> -const struct drm_crtc_funcs psb_intel_crtc_funcs = {
> +const struct drm_crtc_funcs gma_intel_crtc_funcs = {
>   	.cursor_set = gma_crtc_cursor_set,
>   	.cursor_move = gma_crtc_cursor_move,
>   	.gamma_set = gma_crtc_gamma_set,
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer

-------------- 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/20210201/529f09b8/attachment-0001.sig>