All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Jani Nikula <jani.nikula@linux.intel.com>
Cc: "H.J. Lu" <hjl.tools@gmail.com>,
	intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH] drm: Restore GNOME monitors.xml support
Date: Tue, 20 Jun 2017 11:15:47 +0200	[thread overview]
Message-ID: <20170620091547.6ce7gwjcggcvsjyh@phenom.ffwll.local> (raw)
In-Reply-To: <87zidlfov2.fsf@intel.com>

On Tue, Jun 06, 2017 at 12:26:57PM +0300, Jani Nikula wrote:
> On Sun, 04 Jun 2017, "H.J. Lu" <hjl.tools@gmail.com> wrote:
> > Please CC me since I am not on this mailing list.
> 
> Sorry, should've instructed you to send to dri-devel instead of
> intel-gfx, because the patch touches drm helpers. Cc'd.
> 
> BR,
> Jani.
> 
> >
> > H.J.
> > ---
> > 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.

Ok, I think the real bugfix is just getting the properties after probing,
to have the updated EDID. Please test the below more minimal fixup:

commit 4b5d7e764afaf9a2e80e1f78641b5bd17af4692b
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Jun 20 11:13:42 2017 +0200

    drm: Fix GETCONNECTOR regression
    
    In
    
    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
    
    I reordered the logic a bit in that IOCTL, but that broke userspace
    since it'll get the new mode list, but not the new property values.
    Fix that again.
    
    Fixes: 91eefc05f0ac ("drm: Tighten locking in drm_mode_getconnector")
    Cc: Sean Paul <seanpaul@chromium.org>
    Cc: Daniel Vetter <daniel.vetter@intel.com>
    Cc: Jani Nikula <jani.nikula@linux.intel.com>
    Cc: David Airlie <airlied@linux.ie>
    Cc: dri-devel@lists.freedesktop.org
    Reported-by: "H.J. Lu" <hjl.tools@gmail.com>
    Cc: "H.J. Lu" <hjl.tools@gmail.com>
    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c
index 5cd61aff7857..e0fd8168a178 100644
--- a/drivers/gpu/drm/drm_connector.c
+++ b/drivers/gpu/drm/drm_connector.c
@@ -1293,21 +1293,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++;
@@ -1372,6 +1357,24 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
 	out_resp->count_modes = mode_count;
 out:
 	mutex_unlock(&dev->mode_config.mutex);
+
+	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;
+
+	/* Only grab properties after probing, to make sure EDID and other
+	 * properties reflect the latest status. */
+	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;
+
 out_unref:
 	drm_connector_put(connector);

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

      reply	other threads:[~2017-06-20  9:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-04 15:34 [PATCH] drm: Restore GNOME monitors.xml support H.J. Lu
2017-06-06  9:26 ` Jani Nikula
2017-06-20  9:15   ` Daniel Vetter [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170620091547.6ce7gwjcggcvsjyh@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hjl.tools@gmail.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.