From patchwork Fri May 18 15:17:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liviu Dudau X-Patchwork-Id: 136323 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1371961lji; Fri, 18 May 2018 08:18:24 -0700 (PDT) X-Google-Smtp-Source: AB8JxZq383fJzOFe5PM+2j8BCNzfHkOtwJCubmDy3n/aVbTImJJpaXSoiD3KEkKDRJzmTt9gNRFA X-Received: by 2002:a17:902:b946:: with SMTP id h6-v6mr10231323pls.3.1526656704165; Fri, 18 May 2018 08:18:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526656704; cv=none; d=google.com; s=arc-20160816; b=VYuyMQCXSxlT9obCNjFRQB5KaCPBIvXjH9waXKthFiUlyDVbhKikad7CcMNtxVUW0t nkCwpdXta52vP++lBr3oJBzIkPgLXspttimIulO7INwXxE1byY6haaIrKH8Cz13wVYgD pCdKNQiavesihhPTGJ9psLY5GIewpp79ba6C7mpC579AOSClvKONUN2anNGySK2GPrI+ f023/rKZ/H7AEOkv2VQtub3VwDCKNjM7lAesA1VwXXg51+B23WWwFoNf6pWKfyuNjB1S wdNmMlXUxCZk3UDYbZeZvkw5aAK9w8uPkD2jooWTut+0Rsg908kwvanSYP4QBHxv3Nob ooEA== 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=d3/B3lFLsT0N3ZNP0HeYtBC8qyaacV1GnXP7ZnS8RHg=; b=obeThzWdPJxdTv8NU8bWkFEJqeV/5ELohSQPky078+K45/xsZoRl26Xhb1qYK9Zd4I l5HMvSP/9Rb0d1EkBOviI+098iZzaizdMr2o1E+gjBxJuLcbtvTFW4SwQ+PD2W+xEQmh sgBEXV4Wfa2W+q8g2pKni17WqMsPH5DiM0ThOwyKATjA6l1FidvUxg2dBHI6ftvSUW27 wvuxTSvV6DhoIsKt/LyP/2/FDbfkooyykPWGMXRzwA6i3Y8yrj4a+bPx49Kzoqbivk1R ud2MiCfLAiG9SN/hl+ifWfzN8ypHQH3rg6lAGY44NYLDUMfUQ3jAVwMnade8LZxh707W TIRA== 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 67-v6si7811107pfm.167.2018.05.18.08.18.23; Fri, 18 May 2018 08:18:24 -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 S1752213AbeERPSI (ORCPT + 29 others); Fri, 18 May 2018 11:18:08 -0400 Received: from fw-tnat.cambridge.arm.com ([217.140.96.140]:54889 "EHLO cam-smtp0.cambridge.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751117AbeERPSB (ORCPT ); Fri, 18 May 2018 11:18:01 -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 w4IFHhrK024053; Fri, 18 May 2018 16:17:45 +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 , Liviu Dudau Subject: [PATCH v8 3/3] drm: writeback: Add client capability for exposing writeback connectors Date: Fri, 18 May 2018 16:17:43 +0100 Message-Id: <20180518151743.29937-4-Liviu.Dudau@arm.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180518151743.29937-1-Liviu.Dudau@arm.com> References: <20180518151743.29937-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. 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(+) -- 2.17.0 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index af782911c505d..59951ff3e3630 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -325,6 +325,13 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) file_priv->atomic = req->value; file_priv->universal_planes = req->value; break; + case DRM_CLIENT_CAP_WRITEBACK_CONNECTORS: + if (!file_priv->atomic || !drm_core_check_feature(dev, DRIVER_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 5176c3797680c..2a09b3c8965c6 100644 --- a/include/drm/drm_file.h +++ b/include/drm/drm_file.h @@ -181,6 +181,13 @@ struct drm_file { /** @atomic: True if client understands atomic properties. */ unsigned atomic: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 6fdff5945c8a0..59f27ea928b42 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -680,6 +680,15 @@ struct drm_get_cap { */ #define DRM_CLIENT_CAP_ATOMIC 3 +/** + * 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 4 + /** DRM_IOCTL_SET_CLIENT_CAP ioctl argument type */ struct drm_set_client_cap { __u64 capability;