Patchwork [4/8] drm/mediatek: use drm_for_each_connector_iter()

login
register
mail settings
Submitter Gustavo F. Padovan
Date May 11, 2017, 7:10 p.m.
Message ID <20170511191049.28944-5-gustavo@padovan.org>
Download mbox | patch
Permalink /patch/9722777/
State New
Headers show

Comments

Gustavo F. Padovan - May 11, 2017, 7:10 p.m.
From: Gustavo Padovan <gustavo.padovan@collabora.com>

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

Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>

---
only built-tested!
---
 drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Daniel Vetter - May 12, 2017, 7:44 a.m.
On Thu, May 11, 2017 at 04:10:45PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.com>
> 
> Drop legacy drm_for_each_connector() in favor of the race-free
> drm_for_each_connector_iter().
> 
> Cc: Philipp Zabel <p.zabel@pengutronix.de>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
> 
> ---
> only built-tested!
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 6b08774..6582e1f 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -221,6 +221,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
>  	struct drm_crtc *crtc = &mtk_crtc->base;
>  	struct drm_connector *connector;
>  	struct drm_encoder *encoder;
> +	struct drm_connector_list_iter conn_iter;
>  	unsigned int width, height, vrefresh, bpc = MTK_MAX_BPC;
>  	int ret;
>  	int i;
> @@ -237,13 +238,15 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
>  		if (encoder->crtc != crtc)
>  			continue;
>  
> -		drm_for_each_connector(connector, crtc->dev) {
> +		drm_connector_list_iter_begin(crtc->dev, &conn_iter);
> +		drm_for_each_connector_iter(connector, &conn_iter) {
>  			if (connector->encoder != encoder)
>  				continue;
>  			if (connector->display_info.bpc != 0 &&
>  			    bpc > connector->display_info.bpc)
>  				bpc = connector->display_info.bpc;

Computing bpc here is probably a bug, should be done in atomic_check most
likely. But there's already a todo about this.

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

>  		}
> +		drm_connector_list_iter_end(&conn_iter);
>  	}
>  
>  	ret = pm_runtime_get_sync(crtc->dev->dev);
> -- 
> 2.9.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
index 6b08774..6582e1f 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -221,6 +221,7 @@  static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
 	struct drm_crtc *crtc = &mtk_crtc->base;
 	struct drm_connector *connector;
 	struct drm_encoder *encoder;
+	struct drm_connector_list_iter conn_iter;
 	unsigned int width, height, vrefresh, bpc = MTK_MAX_BPC;
 	int ret;
 	int i;
@@ -237,13 +238,15 @@  static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)
 		if (encoder->crtc != crtc)
 			continue;
 
-		drm_for_each_connector(connector, crtc->dev) {
+		drm_connector_list_iter_begin(crtc->dev, &conn_iter);
+		drm_for_each_connector_iter(connector, &conn_iter) {
 			if (connector->encoder != encoder)
 				continue;
 			if (connector->display_info.bpc != 0 &&
 			    bpc > connector->display_info.bpc)
 				bpc = connector->display_info.bpc;
 		}
+		drm_connector_list_iter_end(&conn_iter);
 	}
 
 	ret = pm_runtime_get_sync(crtc->dev->dev);