From patchwork Tue Jun 12 13:52:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 138349 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5384972lji; Tue, 12 Jun 2018 06:53:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJDy8m64FOJWt1ZdlSjK+cImugjrhcyCeJ9aB70ID43+Qn8DgkqlK5V4xLROdW0dLYpPqZ/ X-Received: by 2002:a63:bd51:: with SMTP id d17-v6mr459456pgp.42.1528811619550; Tue, 12 Jun 2018 06:53:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528811619; cv=none; d=google.com; s=arc-20160816; b=oJnkSbw0Pb7Kth6iCsmG9ibjRbL5aOzjqVP7syZ9wR9xVaGzb2QBf4jgR/3MhVOQ81 +BpCpYJcJem407mgGcKtuCXUNGUXazcRkxnbdhS0JIPfA1d9qBRdp/Nod8rj2B3/QG7d FHaSiPn/K2ZDgo6/zbsdSBmeOtXz676PxmNXn4N05gOHDPnnelCChz82qfpfZr4ajYMu yrJ19K+yoldVaYzg8+6BdDfEwL2J0vI4SPhQtJL++M9UA7Xav/cnOq/ru0VzhvxrCcoN KfAakcvxv3CpLJ3Pj1zv5UsYKrjYhj++ox2ZT1WgUFPp7NIvZljfOOpqsB+QU62uT3+l 2wEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=7IyXChd/prsr9xZli9WL9nIWZXcBS2Q/H3fLgGnGaRU=; b=iXhjZ5/Kcl+8ujKGoKhF6+Uj+HL6xwsW3WpRk3HBB3mS+9uuBjuF27VazQ/WoeyHXq vfRGKNF2rx2urxxJeEDTmn2kcsb4KQ8e64Y0WMTVqJqaj8uI0+Dla2YnrAH401O8xV+w CRW5fNwTrQWdClH/BMkRf6mTLR6AMGy27bGTHrgCEbRf3mHGPEDlU6aD2KAfGUMPMQQF APjTRp1ue9u4U6GA+BrWNEf07LM2DMWQL06HnplcHAq63El4ZuT4EaIqDQx3HdfVNCLr JcbQ/oivvIU5VKUIgNHZy5LnwepyAZCgKpF+/gg1iBDAoRDEzdOSAQuELUFBQcjj4ZW0 Z2yw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c7-v6si198578pfd.89.2018.06.12.06.53.39; Tue, 12 Jun 2018 06:53:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934100AbeFLNxh (ORCPT + 30 others); Tue, 12 Jun 2018 09:53:37 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:18121 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933574AbeFLNxg (ORCPT ); Tue, 12 Jun 2018 09:53:36 -0400 Received: from e110455-lin.cambridge.arm.com (e110455-lin.cambridge.arm.com [10.2.131.61]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id w5CDqX1o016479; Tue, 12 Jun 2018 14:52:35 +0100 From: Liviu Dudau To: Gustavo Padovan Cc: Maarten Lankhorst , Sean Paul , Jonathan Corbet , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie , Brian Starkey , Alexandru-Cosmin Gheorghe , Eric Anholt , Boris Brezillon , Maxime Ripard , Daniel Stone , Rob Clark , Liviu Dudau Subject: [PATCH v10 3/3] drm: writeback: Add client capability for exposing writeback connectors Date: Tue, 12 Jun 2018 14:52:33 +0100 Message-Id: <20180612135233.18575-4-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612135233.18575-1-Liviu.Dudau@arm.com> References: <20180612135233.18575-1-Liviu.Dudau@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Due to the fact that writeback connectors behave in a special way in DRM (they always report being disconnected) we might confuse some userspace. Add a client capability for writeback connectors that will filter them out for clients that don't understand the capability. Changelog: - only accept the capability if the client has already set the DRM_CLIENT_CAP_ATOMIC one. Cc: Sean Paul Cc: Brian Starkey Signed-off-by: Liviu Dudau --- drivers/gpu/drm/drm_ioctl.c | 7 +++++++ drivers/gpu/drm/drm_mode_config.c | 5 +++++ include/drm/drm_file.h | 7 +++++++ include/uapi/drm/drm.h | 9 +++++++++ 4 files changed, 28 insertions(+) -- 2.17.1 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 0d4cfb232576f..fe49fb0356b5a 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -334,6 +334,13 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) return -EINVAL; file_priv->aspect_ratio_allowed = req->value; break; + case DRM_CLIENT_CAP_WRITEBACK_CONNECTORS: + if (!file_priv->atomic) + return -EINVAL; + if (req->value > 1) + return -EINVAL; + file_priv->writeback_connectors = req->value; + break; default: return -EINVAL; } diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_config.c index e5c653357024d..21e353bd3948e 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -145,6 +145,11 @@ int drm_mode_getresources(struct drm_device *dev, void *data, count = 0; connector_id = u64_to_user_ptr(card_res->connector_id_ptr); drm_for_each_connector_iter(connector, &conn_iter) { + /* only expose writeback connectors if userspace understands them */ + if (!file_priv->writeback_connectors && + (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)) + continue; + if (drm_lease_held(file_priv, connector->base.id)) { if (count < card_res->count_connectors && put_user(connector->base.id, connector_id + count)) { diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h index 027ac16da3d15..26485acc51d79 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -192,6 +192,13 @@ struct drm_file { */ unsigned aspect_ratio_allowed:1; + /** + * @writeback_connectors: + * + * True if client understands writeback connectors + */ + unsigned writeback_connectors:1; + /** * @is_master: * diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index 9c660e1688abe..300f336633f28 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -687,6 +687,15 @@ struct drm_get_cap { */ #define DRM_CLIENT_CAP_ASPECT_RATIO 4 +/** + * DRM_CLIENT_CAP_WRITEBACK_CONNECTORS + * + * If set to 1, the DRM core will expose special connectors to be used for + * writing back to memory the scene setup in the commit. Depends on client + * also supporting DRM_CLIENT_CAP_ATOMIC + */ +#define DRM_CLIENT_CAP_WRITEBACK_CONNECTORS 5 + /** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ struct drm_set_client_cap { __u64 capability;