On Tue, Jun 06, 2017 at 12:26:57PM +0300, Jani Nikula wrote:
> On Sun, 04 Jun 2017, "H.J. Lu" <hjl.tools@xxxxxxxxx> 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@xxxxxxxx>
> > 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@xxxxxxxx>
Date: Tue Jun 20 11:13:42 2017 +0200
drm: Fix GETCONNECTOR regression
In
commit 91eefc05f0ac71902906b2058360e61bd25137fe
Author: Daniel Vetter <daniel.vetter@xxxxxxxx>
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@xxxxxxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Cc: Jani Nikula <jani.nikula@xxxxxxxxxxxxxxx>
Cc: David Airlie <airlied@xxxxxxxx>
Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
Reported-by: "H.J. Lu" <hjl.tools@xxxxxxxxx>
Cc: "H.J. Lu" <hjl.tools@xxxxxxxxx>
Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
