Commit 48a92916 authored by Gustavo Padovan's avatar Gustavo Padovan

drm/exynos: use drm_for_each_connector_iter()

Drop legacy drm_for_each_connector() in favor of the race-free
drm_for_each_connector_iter()

Cc: Inki Dae <inki.dae@samsung.com>
Cc: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170511191049.28944-2-gustavo@padovan.org
parent 71ebc9a3
...@@ -171,12 +171,13 @@ static int exynos_drm_suspend(struct device *dev) ...@@ -171,12 +171,13 @@ static int exynos_drm_suspend(struct device *dev)
{ {
struct drm_device *drm_dev = dev_get_drvdata(dev); struct drm_device *drm_dev = dev_get_drvdata(dev);
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
if (pm_runtime_suspended(dev) || !drm_dev) if (pm_runtime_suspended(dev) || !drm_dev)
return 0; return 0;
drm_modeset_lock_all(drm_dev); drm_connector_list_iter_begin(drm_dev, &conn_iter);
drm_for_each_connector(connector, drm_dev) { drm_for_each_connector_iter(connector, &conn_iter) {
int old_dpms = connector->dpms; int old_dpms = connector->dpms;
if (connector->funcs->dpms) if (connector->funcs->dpms)
...@@ -185,7 +186,7 @@ static int exynos_drm_suspend(struct device *dev) ...@@ -185,7 +186,7 @@ static int exynos_drm_suspend(struct device *dev)
/* Set the old mode back to the connector for resume */ /* Set the old mode back to the connector for resume */
connector->dpms = old_dpms; connector->dpms = old_dpms;
} }
drm_modeset_unlock_all(drm_dev); drm_connector_list_iter_end(&conn_iter);
return 0; return 0;
} }
...@@ -194,12 +195,13 @@ static int exynos_drm_resume(struct device *dev) ...@@ -194,12 +195,13 @@ static int exynos_drm_resume(struct device *dev)
{ {
struct drm_device *drm_dev = dev_get_drvdata(dev); struct drm_device *drm_dev = dev_get_drvdata(dev);
struct drm_connector *connector; struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
if (pm_runtime_suspended(dev) || !drm_dev) if (pm_runtime_suspended(dev) || !drm_dev)
return 0; return 0;
drm_modeset_lock_all(drm_dev); drm_connector_list_iter_begin(drm_dev, &conn_iter);
drm_for_each_connector(connector, drm_dev) { drm_for_each_connector_iter(connector, &conn_iter) {
if (connector->funcs->dpms) { if (connector->funcs->dpms) {
int dpms = connector->dpms; int dpms = connector->dpms;
...@@ -207,7 +209,7 @@ static int exynos_drm_resume(struct device *dev) ...@@ -207,7 +209,7 @@ static int exynos_drm_resume(struct device *dev)
connector->funcs->dpms(connector, dpms); connector->funcs->dpms(connector, dpms);
} }
} }
drm_modeset_unlock_all(drm_dev); drm_connector_list_iter_end(&conn_iter);
return 0; return 0;
} }
......
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