Attachment 142520 Details for Bug 106250 – Kernel fix

[patch] Kernel fix

0001-Return-only-active-connectors-for-GET_RESOURCES.patch (text/plain), 2.31 KB, created by Stanislav Lisovskiy on 2018-11-19 16:33:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislav Lisovskiy

Created: 2018-11-19 16:33:31 UTC

Size: 2.31 KB

patch

obsolete

>From e3f32030b8e3ebf55b27009c56ecca5610a5e11e Mon Sep 17 00:00:00 2001
>From: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
>Date: Mon, 19 Nov 2018 14:23:13 +0200
>Subject: [PATCH] Return only active connectors for GET_RESOURCES
>
>Currently kernel might allocate different connector ids
>for the same outputs in case of DP MST, which seems to
>confuse userspace. There are can be different connector
>ids in the list, which could be assigned to the same
>output, while being in different states.
>The issue can be fixed either in userspace by checking
>connector status more carefully or kernel side, by
>simply not returning non-active connectors at least for
>display ports.
>---
> drivers/gpu/drm/drm_mode_config.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c
>index ee80788f2c40..ec5b2b08a45e 100644
>--- a/drivers/gpu/drm/drm_mode_config.c
>+++ b/drivers/gpu/drm/drm_mode_config.c
>@@ -143,6 +143,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
> 	drm_connector_list_iter_begin(dev, &conn_iter);
> 	count = 0;
> 	connector_id = u64_to_user_ptr(card_res->connector_id_ptr);
>+	DRM_DEBUG_KMS("GetResources: writing connectors start");
> 	drm_for_each_connector_iter(connector, &conn_iter) {
> 		/* only expose writeback connectors if userspace understands them */
> 		if (!file_priv->writeback_connectors &&
>@@ -150,15 +151,20 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
> 			continue;
> 
> 		if (drm_lease_held(file_priv, connector->base.id)) {
>-			if (count < card_res->count_connectors &&
>-			    put_user(connector->base.id, connector_id + count)) {
>-				drm_connector_list_iter_end(&conn_iter);
>-				return -EFAULT;
>+			if (connector->connector_type != DRM_MODE_CONNECTOR_DisplayPort ||
>+				connector->status != connector_status_disconnected) {
>+				if (count < card_res->count_connectors &&
>+				    put_user(connector->base.id, connector_id + count)) {
>+					drm_connector_list_iter_end(&conn_iter);
>+					return -EFAULT;
>+				}
>+				DRM_DEBUG_KMS("GetResources: connector %s", connector->name);
>+				count++;
> 			}
>-			count++;
> 		}
> 	}
> 	card_res->count_connectors = count;
>+	DRM_DEBUG_KMS("GetResources: writing connectors end - count %d", count);
> 	drm_connector_list_iter_end(&conn_iter);
> 
> 	return ret;
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 106250: 140970 | 140971 | 142488 | 142519 | 142520

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.