On Tue, Jun 20, 2017 at 2:32 AM, Jani Nikula
<jani.nikula@xxxxxxxxxxxxxxx> wrote:
> On Tue, 20 Jun 2017, Daniel Vetter <daniel.vetter@xxxxxxxx> wrote:
>> 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>
>
> Possibly
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100576
>
>> ---
>> drivers/gpu/drm/drm_connector.c | 33 ++++++++++++++++++---------------
>> 1 file changed, 18 insertions(+), 15 deletions(-)
>>
>> 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);
>
Yes, it fixed my issue.
Thanks.
--
H.J.
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
