diff options
-rw-r--r-- | drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 0624fab8046f..c96c228a9898 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | |||
@@ -302,9 +302,8 @@ static void ade_set_medianoc_qos(struct ade_crtc *acrtc) | |||
302 | SOCKET_QOS_EN, SOCKET_QOS_EN); | 302 | SOCKET_QOS_EN, SOCKET_QOS_EN); |
303 | } | 303 | } |
304 | 304 | ||
305 | static int ade_enable_vblank(struct drm_device *dev, unsigned int pipe) | 305 | static int ade_crtc_enable_vblank(struct drm_crtc *crtc) |
306 | { | 306 | { |
307 | struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe); | ||
308 | struct ade_crtc *acrtc = to_ade_crtc(crtc); | 307 | struct ade_crtc *acrtc = to_ade_crtc(crtc); |
309 | struct ade_hw_ctx *ctx = acrtc->ctx; | 308 | struct ade_hw_ctx *ctx = acrtc->ctx; |
310 | void __iomem *base = ctx->base; | 309 | void __iomem *base = ctx->base; |
@@ -318,9 +317,8 @@ static int ade_enable_vblank(struct drm_device *dev, unsigned int pipe) | |||
318 | return 0; | 317 | return 0; |
319 | } | 318 | } |
320 | 319 | ||
321 | static void ade_disable_vblank(struct drm_device *dev, unsigned int pipe) | 320 | static void ade_crtc_disable_vblank(struct drm_crtc *crtc) |
322 | { | 321 | { |
323 | struct drm_crtc *crtc = drm_crtc_from_index(dev, pipe); | ||
324 | struct ade_crtc *acrtc = to_ade_crtc(crtc); | 322 | struct ade_crtc *acrtc = to_ade_crtc(crtc); |
325 | struct ade_hw_ctx *ctx = acrtc->ctx; | 323 | struct ade_hw_ctx *ctx = acrtc->ctx; |
326 | void __iomem *base = ctx->base; | 324 | void __iomem *base = ctx->base; |
@@ -570,6 +568,8 @@ static const struct drm_crtc_funcs ade_crtc_funcs = { | |||
570 | .set_property = drm_atomic_helper_crtc_set_property, | 568 | .set_property = drm_atomic_helper_crtc_set_property, |
571 | .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, | 569 | .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, |
572 | .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, | 570 | .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, |
571 | .enable_vblank = ade_crtc_enable_vblank, | ||
572 | .disable_vblank = ade_crtc_disable_vblank, | ||
573 | }; | 573 | }; |
574 | 574 | ||
575 | static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, | 575 | static int ade_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, |
@@ -1025,8 +1025,6 @@ static int ade_drm_init(struct platform_device *pdev) | |||
1025 | IRQF_SHARED, dev->driver->name, acrtc); | 1025 | IRQF_SHARED, dev->driver->name, acrtc); |
1026 | if (ret) | 1026 | if (ret) |
1027 | return ret; | 1027 | return ret; |
1028 | dev->driver->enable_vblank = ade_enable_vblank; | ||
1029 | dev->driver->disable_vblank = ade_disable_vblank; | ||
1030 | 1028 | ||
1031 | return 0; | 1029 | return 0; |
1032 | } | 1030 | } |