aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_crtc.c8
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_crtc.h2
-rw-r--r--drivers/gpu/drm/mediatek/mtk_drm_drv.c3
3 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index a73de1e669c2..69982f5a6198 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -168,9 +168,8 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
168 state->pending_config = true; 168 state->pending_config = true;
169} 169}
170 170
171int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) 171static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
172{ 172{
173 struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);
174 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); 173 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
175 struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; 174 struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
176 175
@@ -179,9 +178,8 @@ int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe)
179 return 0; 178 return 0;
180} 179}
181 180
182void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe) 181static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
183{ 182{
184 struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe);
185 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); 183 struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
186 struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; 184 struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
187 185
@@ -436,6 +434,8 @@ static const struct drm_crtc_funcs mtk_crtc_funcs = {
436 .atomic_duplicate_state = mtk_drm_crtc_duplicate_state, 434 .atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
437 .atomic_destroy_state = mtk_drm_crtc_destroy_state, 435 .atomic_destroy_state = mtk_drm_crtc_destroy_state,
438 .gamma_set = drm_atomic_helper_legacy_gamma_set, 436 .gamma_set = drm_atomic_helper_legacy_gamma_set,
437 .enable_vblank = mtk_drm_crtc_enable_vblank,
438 .disable_vblank = mtk_drm_crtc_disable_vblank,
439}; 439};
440 440
441static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = { 441static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
index a1550fa3c9d2..9d9410c67ae9 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
@@ -23,8 +23,6 @@
23#define MTK_MAX_BPC 10 23#define MTK_MAX_BPC 10
24#define MTK_MIN_BPC 3 24#define MTK_MIN_BPC 3
25 25
26int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe);
27void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe);
28void mtk_drm_crtc_commit(struct drm_crtc *crtc); 26void mtk_drm_crtc_commit(struct drm_crtc *crtc);
29void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl); 27void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl);
30int mtk_drm_crtc_create(struct drm_device *drm_dev, 28int mtk_drm_crtc_create(struct drm_device *drm_dev,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index ef8675336465..f5a1fd9b3ecc 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -256,9 +256,6 @@ static struct drm_driver mtk_drm_driver = {
256 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME | 256 .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_PRIME |
257 DRIVER_ATOMIC, 257 DRIVER_ATOMIC,
258 258
259 .enable_vblank = mtk_drm_crtc_enable_vblank,
260 .disable_vblank = mtk_drm_crtc_disable_vblank,
261
262 .gem_free_object_unlocked = mtk_drm_gem_free_object, 259 .gem_free_object_unlocked = mtk_drm_gem_free_object,
263 .gem_vm_ops = &drm_gem_cma_vm_ops, 260 .gem_vm_ops = &drm_gem_cma_vm_ops,
264 .dumb_create = mtk_drm_gem_dumb_create, 261 .dumb_create = mtk_drm_gem_dumb_create,