aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorJoonyoung Shim <jy0922.shim@samsung.com>2012-06-27 01:27:08 -0400
committerInki Dae <inki.dae@samsung.com>2012-07-26 22:13:54 -0400
commitd55ab76efba4575141d9d3df98886021c064b567 (patch)
tree9ced5ef77402bdf04f1a28df4407b6d7d3d35a59 /drivers/gpu
parentbebab8ff31c6a39aae3dd29f57cd0e20021c1d09 (diff)
drm/exynos: remove unnecessary connector dpms control
The connector dpms should be controlled only by DPMS property and mode set. Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_encoder.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
index 2304d083fb89..5131d5975a4a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c
@@ -327,11 +327,9 @@ void exynos_drm_disable_vblank(struct drm_encoder *encoder, void *data)
327 327
328void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data) 328void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data)
329{ 329{
330 struct drm_device *dev = encoder->dev;
331 struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder); 330 struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);
332 struct exynos_drm_manager *manager = exynos_encoder->manager; 331 struct exynos_drm_manager *manager = exynos_encoder->manager;
333 struct exynos_drm_manager_ops *manager_ops = manager->ops; 332 struct exynos_drm_manager_ops *manager_ops = manager->ops;
334 struct drm_connector *connector;
335 int mode = *(int *)data; 333 int mode = *(int *)data;
336 334
337 DRM_DEBUG_KMS("%s\n", __FILE__); 335 DRM_DEBUG_KMS("%s\n", __FILE__);
@@ -340,15 +338,6 @@ void exynos_drm_encoder_crtc_dpms(struct drm_encoder *encoder, void *data)
340 manager_ops->dpms(manager->dev, mode); 338 manager_ops->dpms(manager->dev, mode);
341 339
342 /* 340 /*
343 * set current dpms mode to the connector connected to
344 * current encoder. connector->dpms would be checked
345 * at drm_helper_connector_dpms()
346 */
347 list_for_each_entry(connector, &dev->mode_config.connector_list, head)
348 if (connector->encoder == encoder)
349 connector->dpms = mode;
350
351 /*
352 * if this condition is ok then it means that the crtc is already 341 * if this condition is ok then it means that the crtc is already
353 * detached from encoder and last function for detaching is properly 342 * detached from encoder and last function for detaching is properly
354 * done, so clear pipe from manager to prevent repeated call. 343 * done, so clear pipe from manager to prevent repeated call.