diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_encoder.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_encoder.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c index 3c3d88e1df38..d14d465392dd 100644 --- a/drivers/gpu/drm/omapdrm/omap_encoder.c +++ b/drivers/gpu/drm/omapdrm/omap_encoder.c | |||
@@ -151,9 +151,6 @@ static void omap_encoder_disable(struct drm_encoder *encoder) | |||
151 | 151 | ||
152 | dev_dbg(dev->dev, "disable(%s)\n", dssdev->name); | 152 | dev_dbg(dev->dev, "disable(%s)\n", dssdev->name); |
153 | 153 | ||
154 | if (!omapdss_device_is_enabled(dssdev)) | ||
155 | return; | ||
156 | |||
157 | dssdev->ops->disable(dssdev); | 154 | dssdev->ops->disable(dssdev); |
158 | 155 | ||
159 | dssdev->state = OMAP_DSS_DISPLAY_DISABLED; | 156 | dssdev->state = OMAP_DSS_DISPLAY_DISABLED; |
@@ -168,9 +165,6 @@ static void omap_encoder_enable(struct drm_encoder *encoder) | |||
168 | 165 | ||
169 | dev_dbg(dev->dev, "enable(%s)\n", dssdev->name); | 166 | dev_dbg(dev->dev, "enable(%s)\n", dssdev->name); |
170 | 167 | ||
171 | if (omapdss_device_is_enabled(dssdev)) | ||
172 | return; | ||
173 | |||
174 | r = dssdev->ops->enable(dssdev); | 168 | r = dssdev->ops->enable(dssdev); |
175 | if (r) { | 169 | if (r) { |
176 | dev_err(dev->dev, "Failed to enable display '%s': %d\n", | 170 | dev_err(dev->dev, "Failed to enable display '%s': %d\n", |