From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id EAB12C004E4 for ; Wed, 13 Jun 2018 10:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AAF02208B0 for ; Wed, 13 Jun 2018 10:26:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAF02208B0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935109AbeFMK0P (ORCPT ); Wed, 13 Jun 2018 06:26:15 -0400 Received: from foss.arm.com ([217.140.101.70]:45544 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754096AbeFMK0O (ORCPT ); Wed, 13 Jun 2018 06:26:14 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 031D480D; Wed, 13 Jun 2018 03:26:14 -0700 (PDT) Received: from e107564-lin.cambridge.arm.com (e107564-lin.cambridge.arm.com [10.2.131.9]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A020D3F25D; Wed, 13 Jun 2018 03:26:11 -0700 (PDT) Date: Wed, 13 Jun 2018 11:26:05 +0100 From: Brian Starkey To: Liviu Dudau Cc: Gustavo Padovan , Maarten Lankhorst , Sean Paul , Jonathan Corbet , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, David Airlie , Alexandru-Cosmin Gheorghe , Eric Anholt , Boris Brezillon , Maxime Ripard , Daniel Stone , Rob Clark Subject: Re: [PATCH v10 3/3] drm: writeback: Add client capability for exposing writeback connectors Message-ID: <20180613102605.GA8131@e107564-lin.cambridge.arm.com> References: <20180612135233.18575-1-Liviu.Dudau@arm.com> <20180612135233.18575-4-Liviu.Dudau@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20180612135233.18575-4-Liviu.Dudau@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Liviu, On Tue, Jun 12, 2018 at 02:52:33PM +0100, Liviu Dudau wrote: >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 LGTM, Reviewed-by: Brian Starkey Thanks, -Brian >--- > 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.1 >