diff options
-rw-r--r-- | drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_crtc.c | 11 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_drv.h | 1 |
3 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index 94529aa82339..aef487dd8731 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c | |||
@@ -164,13 +164,6 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end) | |||
164 | return frm; | 164 | return frm; |
165 | } | 165 | } |
166 | 166 | ||
167 | static u32 decon_get_vblank_counter(struct exynos_drm_crtc *crtc) | ||
168 | { | ||
169 | struct decon_context *ctx = crtc->ctx; | ||
170 | |||
171 | return decon_get_frame_count(ctx, false); | ||
172 | } | ||
173 | |||
174 | static void decon_setup_trigger(struct decon_context *ctx) | 167 | static void decon_setup_trigger(struct decon_context *ctx) |
175 | { | 168 | { |
176 | if (!ctx->crtc->i80_mode && !(ctx->out_type & I80_HW_TRG)) | 169 | if (!ctx->crtc->i80_mode && !(ctx->out_type & I80_HW_TRG)) |
@@ -536,7 +529,6 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { | |||
536 | .disable = decon_disable, | 529 | .disable = decon_disable, |
537 | .enable_vblank = decon_enable_vblank, | 530 | .enable_vblank = decon_enable_vblank, |
538 | .disable_vblank = decon_disable_vblank, | 531 | .disable_vblank = decon_disable_vblank, |
539 | .get_vblank_counter = decon_get_vblank_counter, | ||
540 | .atomic_begin = decon_atomic_begin, | 532 | .atomic_begin = decon_atomic_begin, |
541 | .update_plane = decon_update_plane, | 533 | .update_plane = decon_update_plane, |
542 | .disable_plane = decon_disable_plane, | 534 | .disable_plane = decon_disable_plane, |
@@ -554,7 +546,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) | |||
554 | int ret; | 546 | int ret; |
555 | 547 | ||
556 | ctx->drm_dev = drm_dev; | 548 | ctx->drm_dev = drm_dev; |
557 | drm_dev->max_vblank_count = 0xffffffff; | ||
558 | 549 | ||
559 | for (win = ctx->first_win; win < WINDOWS_NR; win++) { | 550 | for (win = ctx->first_win; win < WINDOWS_NR; win++) { |
560 | ctx->configs[win].pixel_formats = decon_formats; | 551 | ctx->configs[win].pixel_formats = decon_formats; |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index eea90251808f..2696289ecc78 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c | |||
@@ -162,16 +162,6 @@ static void exynos_drm_crtc_disable_vblank(struct drm_crtc *crtc) | |||
162 | exynos_crtc->ops->disable_vblank(exynos_crtc); | 162 | exynos_crtc->ops->disable_vblank(exynos_crtc); |
163 | } | 163 | } |
164 | 164 | ||
165 | static u32 exynos_drm_crtc_get_vblank_counter(struct drm_crtc *crtc) | ||
166 | { | ||
167 | struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); | ||
168 | |||
169 | if (exynos_crtc->ops->get_vblank_counter) | ||
170 | return exynos_crtc->ops->get_vblank_counter(exynos_crtc); | ||
171 | |||
172 | return 0; | ||
173 | } | ||
174 | |||
175 | static const struct drm_crtc_funcs exynos_crtc_funcs = { | 165 | static const struct drm_crtc_funcs exynos_crtc_funcs = { |
176 | .set_config = drm_atomic_helper_set_config, | 166 | .set_config = drm_atomic_helper_set_config, |
177 | .page_flip = drm_atomic_helper_page_flip, | 167 | .page_flip = drm_atomic_helper_page_flip, |
@@ -181,7 +171,6 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = { | |||
181 | .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, | 171 | .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, |
182 | .enable_vblank = exynos_drm_crtc_enable_vblank, | 172 | .enable_vblank = exynos_drm_crtc_enable_vblank, |
183 | .disable_vblank = exynos_drm_crtc_disable_vblank, | 173 | .disable_vblank = exynos_drm_crtc_disable_vblank, |
184 | .get_vblank_counter = exynos_drm_crtc_get_vblank_counter, | ||
185 | }; | 174 | }; |
186 | 175 | ||
187 | struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, | 176 | struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h index ec9604f1272b..5e61e707f955 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.h +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h | |||
@@ -135,7 +135,6 @@ struct exynos_drm_crtc_ops { | |||
135 | void (*disable)(struct exynos_drm_crtc *crtc); | 135 | void (*disable)(struct exynos_drm_crtc *crtc); |
136 | int (*enable_vblank)(struct exynos_drm_crtc *crtc); | 136 | int (*enable_vblank)(struct exynos_drm_crtc *crtc); |
137 | void (*disable_vblank)(struct exynos_drm_crtc *crtc); | 137 | void (*disable_vblank)(struct exynos_drm_crtc *crtc); |
138 | u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc); | ||
139 | enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc, | 138 | enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc, |
140 | const struct drm_display_mode *mode); | 139 | const struct drm_display_mode *mode); |
141 | bool (*mode_fixup)(struct exynos_drm_crtc *crtc, | 140 | bool (*mode_fixup)(struct exynos_drm_crtc *crtc, |