From patchwork Sun Jun 4 15:34:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 9766019 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7F62E60364 for ; Mon, 5 Jun 2017 10:03:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E80327CEA for ; Mon, 5 Jun 2017 10:03:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 713AA27E5A; Mon, 5 Jun 2017 10:03:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6DC1E27CEA for ; Mon, 5 Jun 2017 10:03:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72836899DE; Mon, 5 Jun 2017 10:03:27 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B39089FDD for ; Sun, 4 Jun 2017 15:34:48 +0000 (UTC) Received: by mail-yw0-x241.google.com with SMTP id p144so6930983ywp.2 for ; Sun, 04 Jun 2017 08:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=VFPhUi5oY4qRoZvFuXNKEpk0N1rFK9l/XMI0o56OpUQ=; b=EHqJmUou7CrG9Oi45/Ng2uFG+F4rC06195+cKtDfP1ML49sHYqXEjoeaTfBEMnVygh D2p6Dg6PuzEpqo8ZCwS1LubYDJDA8THteBOtczke2lmnwJGl69xtUP1v9pEfh5anPQcv EzQ8NVddzCVCbGGjMjj60yVOTwtKb649EMXeW1AtLQUKMBGgZjFD+5mSuOv0IdKKat6T r433a10WNjka2zSU7GQlaotHW0ZVsoOaEk9Yy+MMRIpqUX1EFXmZtt5G3pYxZv5jXefa Ms2XMFUHknJ32bn23imy7XLYIJ1potRY6wRm+eo9jEr8itBlzdwEacYrz2KxvEthJwpL NpRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=VFPhUi5oY4qRoZvFuXNKEpk0N1rFK9l/XMI0o56OpUQ=; b=je12NgoLVkBrb+V1hPibFCCwU/+e4egLNcDvs54L+8iKX6ygwguXcQdW8rnjNsZi23 ylbmuFbuMZR/ZsElIDLIk30Yy9r5zC6YRzJh52LqbKaDVjf9nIjN7PgA5TeJDrIKOOcB mr2cjjfpU77X1d2mQjtmtMzSTxBK5o8ZG8XV4gqmAMACMasPqOAxLXAXyYSM6AbgcP4u 9/Cja7sQrREQS1ukqT3qCaTAds/R9MAgfUV/OqEc3PP8dJaVHV29sJpc1WlkJz2eguCT zmBBLm3ROL501KNkDhJZeM/oTOdvVHMjkJ86pE1m4xEEVFPt5komgRwdzAGwyZNdbZex saoQ== X-Gm-Message-State: AODbwcA9Sa1RkBbd966NADxWaTTF6fmS98CuPlUmRfgGBuAX3aOgEJu3 c62aKJmIBIpResys X-Received: by 10.13.245.71 with SMTP id e68mr12108623ywf.269.1496590487321; Sun, 04 Jun 2017 08:34:47 -0700 (PDT) Received: from gnu-tools-1.localdomain (76-220-59-38.lightspeed.sntcca.sbcglobal.net. [76.220.59.38]) by smtp.gmail.com with ESMTPSA id i188sm328656ywc.64.2017.06.04.08.34.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 08:34:46 -0700 (PDT) Received: by gnu-tools-1.localdomain (Postfix, from userid 1000) id 8CF9420152; Sun, 4 Jun 2017 08:34:45 -0700 (PDT) Date: Sun, 4 Jun 2017 08:34:45 -0700 From: "H.J. Lu" To: intel-gfx@lists.freedesktop.org Message-ID: <20170604153445.GA8094@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.0 (2017-02-23) X-Mailman-Approved-At: Mon, 05 Jun 2017 10:03:26 +0000 Subject: [Intel-gfx] [PATCH] drm: Restore GNOME monitors.xml support X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Please CC me since I am not on this mailing list. 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 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. This may also fix: https://bugs.freedesktop.org/show_bug.cgi?id=100576 Signed-off-by: H.J. Lu --- 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;