Attachment 131643 Details for Bug 100576 – An updated patch

[patch] An updated patch

0001-drm-Restore-GNOME-monitors.xml-support.patch (text/plain), 3.85 KB, created by H.J. Lu on 2017-06-01 15:23:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: H.J. Lu

Created: 2017-06-01 15:23:48 UTC

Size: 3.85 KB

patch

obsolete

>From 352bae15cc465dde04d559bbed8514a16b6017e7 Mon Sep 17 00:00:00 2001
>From: "H.J. Lu" <hjl.tools@gmail.com>
>Date: Thu, 1 Jun 2017 08:09:56 -0700
>Subject: [PATCH] drm: Restore GNOME monitors.xml support
>
>My ~/.config/monitors.xml swaps primary/secondary displays as well as
>their horizontal positions.  It works fine until:
>
>commit 91eefc05f0ac71902906b2058360e61bd25137fe
>Author: Daniel Vetter <daniel.vetter@ffwll.ch>
>Date:   Wed Dec 14 00:08:10 2016 +0100
>
>    drm: Tighten locking in drm_mode_getconnector
>
>which makes ~/.config/monitors.xml not effective.  This patch reorders
>drm_mode_getconnector and restores monitors.xml support.
>
>Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
>---
> drivers/gpu/drm/drm_connector.c | 74 ++++++++++++++++++++---------------------
> 1 file changed, 37 insertions(+), 37 deletions(-)
>
>diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
>index 45464c8..4fe8ff3 100644
>--- a/drivers/gpu/drm/drm_connector.c
>+++ b/drivers/gpu/drm/drm_connector.c
>@@ -1169,41 +1169,6 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
> 	if (!connector)
> 		return -ENOENT;
> 
>-	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
>-	encoder = drm_connector_get_encoder(connector);
>-	if (encoder)
>-		out_resp->encoder_id = encoder->base.id;
>-	else
>-		out_resp->encoder_id = 0;
>-
>-	ret = drm_mode_object_get_properties(&connector->base, file_priv->atomic,
>-			(uint32_t __user *)(unsigned long)(out_resp->props_ptr),
>-			(uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr),
>-			&out_resp->count_props);
>-	drm_modeset_unlock(&dev->mode_config.connection_mutex);
>-	if (ret)
>-		goto out_unref;
>-
>-	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)
>-		if (connector->encoder_ids[i] != 0)
>-			encoders_count++;
>-
>-	if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
>-		copied = 0;
>-		encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
>-		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
>-			if (connector->encoder_ids[i] != 0) {
>-				if (put_user(connector->encoder_ids[i],
>-					     encoder_ptr + copied)) {
>-					ret = -EFAULT;
>-					goto out_unref;
>-				}
>-				copied++;
>-			}
>-		}
>-	}
>-	out_resp->count_encoders = encoders_count;
>-
> 	out_resp->connector_id = connector->base.id;
> 	out_resp->connector_type = connector->connector_type;
> 	out_resp->connector_type_id = connector->connector_type_id;
>@@ -1240,15 +1205,50 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
> 			if (copy_to_user(mode_ptr + copied,
> 					 &u_mode, sizeof(u_mode))) {
> 				ret = -EFAULT;
>+				mutex_unlock(&dev->mode_config.mutex);
> 				goto out;
> 			}
> 			copied++;
> 		}
> 	}
> 	out_resp->count_modes = mode_count;
>-out:
> 	mutex_unlock(&dev->mode_config.mutex);
>-out_unref:
>+
>+	drm_modeset_lock(&dev->mode_config.connection_mutex, NULL);
>+	encoder = drm_connector_get_encoder(connector);
>+	if (encoder)
>+		out_resp->encoder_id = encoder->base.id;
>+	else
>+		out_resp->encoder_id = 0;
>+
>+	ret = drm_mode_object_get_properties(&connector->base, file_priv->atomic,
>+			(uint32_t __user *)(unsigned long)(out_resp->props_ptr),
>+			(uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr),
>+			&out_resp->count_props);
>+	drm_modeset_unlock(&dev->mode_config.connection_mutex);
>+	if (ret)
>+		goto out;
>+
>+	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++)
>+		if (connector->encoder_ids[i] != 0)
>+			encoders_count++;
>+
>+	if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
>+		copied = 0;
>+		encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
>+		for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
>+			if (connector->encoder_ids[i] != 0) {
>+				if (put_user(connector->encoder_ids[i],
>+					     encoder_ptr + copied)) {
>+					ret = -EFAULT;
>+					goto out;
>+				}
>+				copied++;
>+			}
>+		}
>+	}
>+	out_resp->count_encoders = encoders_count;
>+out:
> 	drm_connector_unreference(connector);
> 
> 	return ret;
>-- 
>2.9.4
>

Actions: View | Splinter Review

Attachments on bug 100576: 131642 | 131643

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.