drm: kirin: Move ade crtc/plane help functions to driver_data

As part of refactoring the kirin driver to better support
different hardware revisions, this patch moves the crtc
and plane funcs/helper_funcs to the struct kirin_drm_data.

This will make it easier to add support for new devices
via a new kirin_drm_data structure.

Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Xu YiPing <xuyiping@hisilicon.com>
[jstultz: reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190820230626.23253-14-john.stultz@linaro.org

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index 4c6646dfc465e766d81dfc98b677c666ef436f7b..a1a79f372bcdb7522c542c116cf66a56d0609492 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -602,13 +602,13 @@ static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
        crtc->port = port;
 
        ret = drm_crtc_init_with_planes(dev, crtc, plane, NULL,
-                                       &ade_crtc_funcs, NULL);
+                                       ade_driver_data.crtc_funcs, NULL);
        if (ret) {
                DRM_ERROR("failed to init crtc.\n");
                return ret;
        }
 
-       drm_crtc_helper_add(crtc, &ade_crtc_helper_funcs);
+       drm_crtc_helper_add(crtc, ade_driver_data.crtc_helper_funcs);
 
        return 0;
 }
@@ -917,14 +917,15 @@ static int ade_plane_init(struct drm_device *dev, struct kirin_plane *kplane,
        if (ret)
                return ret;
 
-       ret = drm_universal_plane_init(dev, &kplane->base, 1, &ade_plane_funcs,
-                                      fmts, fmts_cnt, NULL, type, NULL);
+       ret = drm_universal_plane_init(dev, &kplane->base, 1,
+                                      ade_driver_data.plane_funcs, fmts,
+                                      fmts_cnt, NULL, type, NULL);
        if (ret) {
                DRM_ERROR("fail to init plane, ch=%d\n", kplane->ch);
                return ret;
        }
 
-       drm_plane_helper_add(&kplane->base, &ade_plane_helper_funcs);
+       drm_plane_helper_add(&kplane->base, ade_driver_data.plane_helper_funcs);
 
        return 0;
 }
@@ -1056,6 +1057,10 @@ static void ade_drm_cleanup(struct platform_device *pdev)
 }
 
 struct kirin_drm_data ade_driver_data = {
+       .crtc_helper_funcs = &ade_crtc_helper_funcs,
+       .crtc_funcs = &ade_crtc_funcs,
+       .plane_helper_funcs = &ade_plane_helper_funcs,
+       .plane_funcs = &ade_plane_funcs,
        .init = ade_drm_init,
        .cleanup = ade_drm_cleanup
 };

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
index cd2eaa653db719b13528fd62fae03e4983480398..70b04e65789cba293a058a9aedde2f666b0df0e3 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h
@@ -35,6 +35,11 @@ struct kirin_plane {
 
 /* display controller init/cleanup ops */
 struct kirin_drm_data {
+       const struct drm_crtc_helper_funcs *crtc_helper_funcs;
+       const struct drm_crtc_funcs *crtc_funcs;
+       const struct drm_plane_helper_funcs *plane_helper_funcs;
+       const struct drm_plane_funcs  *plane_funcs;
+
        int (*init)(struct platform_device *pdev);
        void (*cleanup)(struct platform_device *pdev);
 };