Commit bb0fa935 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae

drm/exynos: don't track enabled state at exynos_crtc

struct drm_crtc already stores the enabled state of the crtc
thus we don't need to replicate enabled in exynos_drm_crtc.
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 92cffd56
...@@ -25,14 +25,9 @@ static void exynos_drm_crtc_enable(struct drm_crtc *crtc) ...@@ -25,14 +25,9 @@ static void exynos_drm_crtc_enable(struct drm_crtc *crtc)
{ {
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
if (exynos_crtc->enabled)
return;
if (exynos_crtc->ops->enable) if (exynos_crtc->ops->enable)
exynos_crtc->ops->enable(exynos_crtc); exynos_crtc->ops->enable(exynos_crtc);
exynos_crtc->enabled = true;
drm_crtc_vblank_on(crtc); drm_crtc_vblank_on(crtc);
} }
...@@ -40,9 +35,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) ...@@ -40,9 +35,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
{ {
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
if (!exynos_crtc->enabled)
return;
/* wait for the completion of page flip. */ /* wait for the completion of page flip. */
if (!wait_event_timeout(exynos_crtc->pending_flip_queue, if (!wait_event_timeout(exynos_crtc->pending_flip_queue,
(exynos_crtc->event == NULL), HZ/20)) (exynos_crtc->event == NULL), HZ/20))
...@@ -52,8 +44,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) ...@@ -52,8 +44,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
if (exynos_crtc->ops->disable) if (exynos_crtc->ops->disable)
exynos_crtc->ops->disable(exynos_crtc); exynos_crtc->ops->disable(exynos_crtc);
exynos_crtc->enabled = false;
} }
static bool static bool
...@@ -172,9 +162,6 @@ int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int pipe) ...@@ -172,9 +162,6 @@ int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int pipe)
struct exynos_drm_crtc *exynos_crtc = struct exynos_drm_crtc *exynos_crtc =
to_exynos_crtc(private->crtc[pipe]); to_exynos_crtc(private->crtc[pipe]);
if (!exynos_crtc->enabled)
return -EPERM;
if (exynos_crtc->ops->enable_vblank) if (exynos_crtc->ops->enable_vblank)
return exynos_crtc->ops->enable_vblank(exynos_crtc); return exynos_crtc->ops->enable_vblank(exynos_crtc);
...@@ -187,9 +174,6 @@ void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int pipe) ...@@ -187,9 +174,6 @@ void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int pipe)
struct exynos_drm_crtc *exynos_crtc = struct exynos_drm_crtc *exynos_crtc =
to_exynos_crtc(private->crtc[pipe]); to_exynos_crtc(private->crtc[pipe]);
if (!exynos_crtc->enabled)
return;
if (exynos_crtc->ops->disable_vblank) if (exynos_crtc->ops->disable_vblank)
exynos_crtc->ops->disable_vblank(exynos_crtc); exynos_crtc->ops->disable_vblank(exynos_crtc);
} }
......
...@@ -136,7 +136,6 @@ struct exynos_drm_crtc { ...@@ -136,7 +136,6 @@ struct exynos_drm_crtc {
struct drm_crtc base; struct drm_crtc base;
enum exynos_drm_output_type type; enum exynos_drm_output_type type;
unsigned int pipe; unsigned int pipe;
bool enabled;
wait_queue_head_t pending_flip_queue; wait_queue_head_t pending_flip_queue;
struct drm_pending_vblank_event *event; struct drm_pending_vblank_event *event;
const struct exynos_drm_crtc_ops *ops; const struct exynos_drm_crtc_ops *ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment