Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp2939811imm; Thu, 24 May 2018 19:30:17 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpenZcYS1MWeNyOAC/heZkF5Um9vClJUBsIXsbI4cyTQAXrxSmYWSoQFjv2T9/GS9p589j2 X-Received: by 2002:a63:7209:: with SMTP id n9-v6mr464723pgc.146.1527215417402; Thu, 24 May 2018 19:30:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527215417; cv=none; d=google.com; s=arc-20160816; b=bemGTy/69TPk6KZ7nH8QBhhu3c58OjDzCK2mGmnGoxngM9h9mc3gw8ikFV2R63lVJg juYMBKzrweUB3bhkeoDHsxBJ9VBfrJ4RVOgQQOpvFiifFOOZqWEx0x0O9S+887RfU9Db z0+7gvW6qxhreiQXRBCgDwOJyvmoVjwSeGo5BRLInELdBFH51+TIY4lVYGDvtyDexdS4 fvVSDyv6q7aQAJ3hgXZBcZaCEmYjFohvKLz2CRuJ4M/joXabTE7c5p7m9x5OqVe/qvW4 8kEAWPqXqGNSYdFDGv3nOuXzojjgRmSmtigaOJlm4xS7S4IhPxbAHzzDeiB+tMo72Ty3 QyYg== 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=TmyyVsQa9qSgOVb4bBRjluWskvtWldhXSamrkJ5pgGg=; b=e/HubtEQ70qAt/xZWgqSmBAy/Myl+RMoiTUE/ejOy3cx/V8aLYZkDqGE15sRCMV5AI T1S0Ti7xhCQ+RIX4endT2552MDbL0t4kI58QHkTi81zDjLNfCeqSFfJ4cRMOpAIUGh+9 cLDw7efydTXoP8mfTPMr0sZUEpDEx+BTQuGD69k6yvwjrtpsnmNozXBrWvN95hMbRps5 o6XQCUJQ7QsuxxQHFmi8odtSVE6VHkqt8GZTxu4t/ns2kDDQ5+L1oJTw4gXIzkNkBZHG wkhV9o+C3A/8RQ0zeSFM9KT6Oi15gjjafe+HgqvJMIybHq19IqGI3Sf12zpY15s9782B PAbQ== 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 1-v6si22723655plw.519.2018.05.24.19.30.02; Thu, 24 May 2018 19:30:17 -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 S1033864AbeEXQmY (ORCPT + 99 others); Thu, 24 May 2018 12:42:24 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:59879 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030846AbeEXQlW (ORCPT ); Thu, 24 May 2018 12:41:22 -0400 Received: from e110455-lin.cambridge.arm.com (e110455-lin.cambridge.arm.com [10.2.131.15]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id w4OGf3qu030243; Thu, 24 May 2018 17:41:05 +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 v9 3/3] drm: writeback: Add client capability for exposing writeback connectors Date: Thu, 24 May 2018 17:41:03 +0100 Message-Id: <20180524164103.8378-4-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180524164103.8378-1-Liviu.Dudau@arm.com> References: <20180524164103.8378-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. - update the capability number to fix conflict with the aspect ratio Reviewed-by: Eric Anholt Re-requested-by: 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(+) 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; -- 2.17.0