[PATCH 2/4] drm/gma500: Move gma_intel_crtc_funcs into gma_display.c
Thomas Zimmermann
tzimmermann at suse.de
Thu Mar 17 19:47:13 UTC 2022
Am 17.03.22 um 10:25 schrieb Patrik Jakobsson:
> All functions live in gma_display.c already so move the vtable. Also
> shorten the name to gma_crtc_funcs.
>
> 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/gma_display.c | 12 ++++++++++++
> drivers/gpu/drm/gma500/gma_display.h | 10 ++--------
> 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 | 12 ------------
> 7 files changed, 17 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/gma500/cdv_device.c b/drivers/gpu/drm/gma500/cdv_device.c
> index d7c6cca23e94..887c157d75f4 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 = &gma_intel_crtc_funcs,
> + .crtc_funcs = &gma_crtc_funcs,
> .clock_funcs = &cdv_clock_funcs,
>
> .output_init = cdv_output_init,
> diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
> index dd801404cf99..931ffb192fc4 100644
> --- a/drivers/gpu/drm/gma500/gma_display.c
> +++ b/drivers/gpu/drm/gma500/gma_display.c
> @@ -565,6 +565,18 @@ int gma_crtc_set_config(struct drm_mode_set *set,
> return ret;
> }
>
> +const struct drm_crtc_funcs gma_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,
> +};
> +
> /*
> * Save HW states of given crtc
> */
> diff --git a/drivers/gpu/drm/gma500/gma_display.h b/drivers/gpu/drm/gma500/gma_display.h
> index 7bd6c1ee8b21..113cf048105e 100644
> --- a/drivers/gpu/drm/gma500/gma_display.h
> +++ b/drivers/gpu/drm/gma500/gma_display.h
> @@ -58,15 +58,7 @@ extern bool gma_pipe_has_type(struct drm_crtc *crtc, int type);
> extern void gma_wait_for_vblank(struct drm_device *dev);
> extern int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> struct drm_framebuffer *old_fb);
> -extern int gma_crtc_cursor_set(struct drm_crtc *crtc,
> - struct drm_file *file_priv,
> - uint32_t handle,
> - uint32_t width, uint32_t height);
> -extern int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y);
> extern void gma_crtc_load_lut(struct drm_crtc *crtc);
> -extern int gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
> - u16 *blue, u32 size,
> - struct drm_modeset_acquire_ctx *ctx);
> extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);
> extern void gma_crtc_prepare(struct drm_crtc *crtc);
> extern void gma_crtc_commit(struct drm_crtc *crtc);
> @@ -83,6 +75,8 @@ extern int gma_crtc_set_config(struct drm_mode_set *set,
> extern void gma_crtc_save(struct drm_crtc *crtc);
> extern void gma_crtc_restore(struct drm_crtc *crtc);
>
> +extern const struct drm_crtc_funcs gma_crtc_funcs;
> +
> extern void gma_encoder_prepare(struct drm_encoder *encoder);
> extern void gma_encoder_commit(struct drm_encoder *encoder);
> extern void gma_encoder_destroy(struct drm_encoder *encoder);
> diff --git a/drivers/gpu/drm/gma500/oaktrail_device.c b/drivers/gpu/drm/gma500/oaktrail_device.c
> index 5c75eae630b5..40f1bc736125 100644
> --- a/drivers/gpu/drm/gma500/oaktrail_device.c
> +++ b/drivers/gpu/drm/gma500/oaktrail_device.c
> @@ -545,7 +545,7 @@ const struct psb_ops oaktrail_chip_ops = {
> .chip_setup = oaktrail_chip_setup,
> .chip_teardown = oaktrail_teardown,
> .crtc_helper = &oaktrail_helper_funcs,
> - .crtc_funcs = &gma_intel_crtc_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 3030f18ba022..e93e4191c0ca 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 = &gma_intel_crtc_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 66f61909a8c8..88f44dbbc4eb 100644
> --- a/drivers/gpu/drm/gma500/psb_drv.h
> +++ b/drivers/gpu/drm/gma500/psb_drv.h
> @@ -13,7 +13,6 @@
>
> #include <drm/drm_device.h>
>
> -#include "gma_display.h"
> #include "gtt.h"
> #include "intel_bios.h"
> #include "mmu.h"
> @@ -647,7 +646,6 @@ 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 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 d5f95212934e..6df62fe7c1e0 100644
> --- a/drivers/gpu/drm/gma500/psb_intel_display.c
> +++ b/drivers/gpu/drm/gma500/psb_intel_display.c
> @@ -427,18 +427,6 @@ const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
> .disable = gma_crtc_disable,
> };
>
> -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,
> - .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 psb_clock_funcs = {
> .clock = psb_intel_clock,
> .limit = psb_intel_limit,
--
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/dc815379/attachment.sig>
More information about the dri-devel
mailing list