diff options
author | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-07-25 17:34:06 +0100 |
commit | ec665af5dd517c60ea1fbe791f6c8ecc443a61b6 (patch) | |
tree | adfe7a2578ecde6d65e927afe65b289efb458ab1 /drivers/gpu/drm/nouveau/nouveau_connector.c | |
parent | 46543af4c9edc5701729b24dd395c23a40871aa9 (diff) | |
parent | f952480a8fc14ea24a4de9582e425924f98c92d3 (diff) |
Merge tag 'v4.14.58' into linux-linaro-lsk-v4.14lsk-v4.14-18.07
This is the 4.14.58 stable release
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index c902a851eb51..430830d63a33 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c @@ -1208,14 +1208,19 @@ nouveau_connector_create(struct drm_device *dev, int index) struct nouveau_display *disp = nouveau_display(dev); struct nouveau_connector *nv_connector = NULL; struct drm_connector *connector; + struct drm_connector_list_iter conn_iter; int type, ret = 0; bool dummy; - list_for_each_entry(connector, &dev->mode_config.connector_list, head) { + drm_connector_list_iter_begin(dev, &conn_iter); + nouveau_for_each_non_mst_connector_iter(connector, &conn_iter) { nv_connector = nouveau_connector(connector); - if (nv_connector->index == index) + if (nv_connector->index == index) { + drm_connector_list_iter_end(&conn_iter); return connector; + } } + drm_connector_list_iter_end(&conn_iter); nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL); if (!nv_connector) |