From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932668AbeEWM1W (ORCPT ); Wed, 23 May 2018 08:27:22 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54496 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbeEWM1T (ORCPT ); Wed, 23 May 2018 08:27:19 -0400 Date: Wed, 23 May 2018 13:27:17 +0100 From: Liviu Dudau To: Maarten Lankhorst Cc: Gustavo Padovan , 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 Subject: Re: [PATCH v8 3/3] drm: writeback: Add client capability for exposing writeback connectors Message-ID: <20180523122716.GF1582@e110455-lin.cambridge.arm.com> References: <20180518151743.29937-1-Liviu.Dudau@arm.com> <20180518151743.29937-4-Liviu.Dudau@arm.com> <7d0201a9-8eed-f332-b6cb-241560cd05c4@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <7d0201a9-8eed-f332-b6cb-241560cd05c4@linux.intel.com> User-Agent: Mutt/1.9.5 (2018-04-13) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 23, 2018 at 11:34:32AM +0200, Maarten Lankhorst wrote: > Op 18-05-18 om 17:17 schreef Liviu Dudau: > > 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(+) > > > > 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; > Wondering how you can set the atomic cap without DRIVER_ATOMIC. :) Caps can only be set one at a time. I was trying to cater for the cases where userspace can set the WRITEBACK_CONNECTORS client cap before or after setting the atomic cap. > > That part could be dropped I think. We should probably WARN when trying to create a writeback connector without the DRIVER_ATOMIC cap set. I could still keep the check for file_priv->atomic being set when accepting the DRM_CLIENT_CAP_WRITEBACK_CONNECTORS and would not need a warn. Best regards, Liviu > > + 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; > > ~Maarten > -- ==================== | I would like to | | fix the world, | | but they're not | | giving me the | \ source code! / --------------- ¯\_(ツ)_/¯ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liviu Dudau Subject: Re: [PATCH v8 3/3] drm: writeback: Add client capability for exposing writeback connectors Date: Wed, 23 May 2018 13:27:17 +0100 Message-ID: <20180523122716.GF1582@e110455-lin.cambridge.arm.com> References: <20180518151743.29937-1-Liviu.Dudau@arm.com> <20180518151743.29937-4-Liviu.Dudau@arm.com> <7d0201a9-8eed-f332-b6cb-241560cd05c4@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by gabe.freedesktop.org (Postfix) with ESMTP id 816646E47A for ; Wed, 23 May 2018 12:27:19 +0000 (UTC) Content-Disposition: inline In-Reply-To: <7d0201a9-8eed-f332-b6cb-241560cd05c4@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst Cc: Maxime Ripard , Daniel Stone , Jonathan Corbet , David Airlie , Boris Brezillon , Alexandru-Cosmin Gheorghe , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBNYXkgMjMsIDIwMTggYXQgMTE6MzQ6MzJBTSArMDIwMCwgTWFhcnRlbiBMYW5raG9y c3Qgd3JvdGU6Cj4gT3AgMTgtMDUtMTggb20gMTc6MTcgc2NocmVlZiBMaXZpdSBEdWRhdToKPiA+ IER1ZSB0byB0aGUgZmFjdCB0aGF0IHdyaXRlYmFjayBjb25uZWN0b3JzIGJlaGF2ZSBpbiBhIHNw ZWNpYWwgd2F5Cj4gPiBpbiBEUk0gKHRoZXkgYWx3YXlzIHJlcG9ydCBiZWluZyBkaXNjb25uZWN0 ZWQpIHdlIG1pZ2h0IGNvbmZ1c2Ugc29tZQo+ID4gdXNlcnNwYWNlLiBBZGQgYSBjbGllbnQgY2Fw YWJpbGl0eSBmb3Igd3JpdGViYWNrIGNvbm5lY3RvcnMgdGhhdCB3aWxsCj4gPiBmaWx0ZXIgdGhl bSBvdXQgZm9yIGNsaWVudHMgdGhhdCBkb24ndCB1bmRlcnN0YW5kIHRoZSBjYXBhYmlsaXR5Lgo+ ID4KPiA+IFJlLXJlcXVlc3RlZC1ieTogU2VhbiBQYXVsIDxzZWFucGF1bEBjaHJvbWl1bS5vcmc+ Cj4gPiBDYzogQnJpYW4gU3RhcmtleSA8YnJpYW4uc3RhcmtleUBhcm0uY29tPgo+ID4gU2lnbmVk LW9mZi1ieTogTGl2aXUgRHVkYXUgPGxpdml1LmR1ZGF1QGFybS5jb20+Cj4gPiAtLS0KPiA+ICBk cml2ZXJzL2dwdS9kcm0vZHJtX2lvY3RsLmMgICAgICAgfCA3ICsrKysrKysKPiA+ICBkcml2ZXJz L2dwdS9kcm0vZHJtX21vZGVfY29uZmlnLmMgfCA1ICsrKysrCj4gPiAgaW5jbHVkZS9kcm0vZHJt X2ZpbGUuaCAgICAgICAgICAgIHwgNyArKysrKysrCj4gPiAgaW5jbHVkZS91YXBpL2RybS9kcm0u aCAgICAgICAgICAgIHwgOSArKysrKysrKysKPiA+ICA0IGZpbGVzIGNoYW5nZWQsIDI4IGluc2Vy dGlvbnMoKykKPiA+Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2RybV9pb2N0bC5j IGIvZHJpdmVycy9ncHUvZHJtL2RybV9pb2N0bC5jCj4gPiBpbmRleCBhZjc4MjkxMWM1MDVkLi41 OTk1MWZmM2UzNjMwIDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9pb2N0bC5j Cj4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lvY3RsLmMKPiA+IEBAIC0zMjUsNiArMzI1 LDEzIEBAIGRybV9zZXRjbGllbnRjYXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0 YSwgc3RydWN0IGRybV9maWxlICpmaWxlX3ByaXYpCj4gPiAgCQlmaWxlX3ByaXYtPmF0b21pYyA9 IHJlcS0+dmFsdWU7Cj4gPiAgCQlmaWxlX3ByaXYtPnVuaXZlcnNhbF9wbGFuZXMgPSByZXEtPnZh bHVlOwo+ID4gIAkJYnJlYWs7Cj4gPiArCWNhc2UgRFJNX0NMSUVOVF9DQVBfV1JJVEVCQUNLX0NP Tk5FQ1RPUlM6Cj4gPiArCQlpZiAoIWZpbGVfcHJpdi0+YXRvbWljIHx8ICFkcm1fY29yZV9jaGVj a19mZWF0dXJlKGRldiwgRFJJVkVSX0FUT01JQykpCj4gPiArCQkJcmV0dXJuIC1FSU5WQUw7Cj4g V29uZGVyaW5nIGhvdyB5b3UgY2FuIHNldCB0aGUgYXRvbWljIGNhcCB3aXRob3V0IERSSVZFUl9B VE9NSUMuIDopCgpDYXBzIGNhbiBvbmx5IGJlIHNldCBvbmUgYXQgYSB0aW1lLiBJIHdhcyB0cnlp bmcgdG8gY2F0ZXIgZm9yIHRoZSBjYXNlcwp3aGVyZSB1c2Vyc3BhY2UgY2FuIHNldCB0aGUgV1JJ VEVCQUNLX0NPTk5FQ1RPUlMgY2xpZW50IGNhcCBiZWZvcmUgb3IKYWZ0ZXIgc2V0dGluZyB0aGUg YXRvbWljIGNhcC4KCj4gCj4gVGhhdCBwYXJ0IGNvdWxkIGJlIGRyb3BwZWQgSSB0aGluay4gV2Ug c2hvdWxkIHByb2JhYmx5IFdBUk4gd2hlbiB0cnlpbmcgdG8gY3JlYXRlIGEgd3JpdGViYWNrIGNv bm5lY3RvciB3aXRob3V0IHRoZSBEUklWRVJfQVRPTUlDIGNhcCBzZXQuCgpJIGNvdWxkIHN0aWxs IGtlZXAgdGhlIGNoZWNrIGZvciBmaWxlX3ByaXYtPmF0b21pYyBiZWluZyBzZXQgd2hlbgphY2Nl cHRpbmcgdGhlIERSTV9DTElFTlRfQ0FQX1dSSVRFQkFDS19DT05ORUNUT1JTIGFuZCB3b3VsZCBu b3QgbmVlZCBhCndhcm4uCgpCZXN0IHJlZ2FyZHMsCkxpdml1Cgo+ID4gKwkJaWYgKHJlcS0+dmFs dWUgPiAxKQo+ID4gKwkJCXJldHVybiAtRUlOVkFMOwo+ID4gKwkJZmlsZV9wcml2LT53cml0ZWJh Y2tfY29ubmVjdG9ycyA9IHJlcS0+dmFsdWU7Cj4gPiArCQlicmVhazsKPiA+ICAJZGVmYXVsdDoK PiA+ICAJCXJldHVybiAtRUlOVkFMOwo+ID4gIAl9Cj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jIGIvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZp Zy5jCj4gPiBpbmRleCBlNWM2NTMzNTcwMjRkLi4yMWUzNTNiZDM5NDhlIDEwMDY0NAo+ID4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2RybV9tb2RlX2NvbmZpZy5jCj4gPiArKysgYi9kcml2ZXJzL2dw dS9kcm0vZHJtX21vZGVfY29uZmlnLmMKPiA+IEBAIC0xNDUsNiArMTQ1LDExIEBAIGludCBkcm1f bW9kZV9nZXRyZXNvdXJjZXMoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgdm9pZCAqZGF0YSwKPiA+ ICAJY291bnQgPSAwOwo+ID4gIAljb25uZWN0b3JfaWQgPSB1NjRfdG9fdXNlcl9wdHIoY2FyZF9y ZXMtPmNvbm5lY3Rvcl9pZF9wdHIpOwo+ID4gIAlkcm1fZm9yX2VhY2hfY29ubmVjdG9yX2l0ZXIo Y29ubmVjdG9yLCAmY29ubl9pdGVyKSB7Cj4gPiArCQkvKiBvbmx5IGV4cG9zZSB3cml0ZWJhY2sg Y29ubmVjdG9ycyBpZiB1c2Vyc3BhY2UgdW5kZXJzdGFuZHMgdGhlbSAqLwo+ID4gKwkJaWYgKCFm aWxlX3ByaXYtPndyaXRlYmFja19jb25uZWN0b3JzICYmCj4gPiArCQkgICAgKGNvbm5lY3Rvci0+ Y29ubmVjdG9yX3R5cGUgPT0gRFJNX01PREVfQ09OTkVDVE9SX1dSSVRFQkFDSykpCj4gPiArCQkJ Y29udGludWU7Cj4gPiArCj4gPiAgCQlpZiAoZHJtX2xlYXNlX2hlbGQoZmlsZV9wcml2LCBjb25u ZWN0b3ItPmJhc2UuaWQpKSB7Cj4gPiAgCQkJaWYgKGNvdW50IDwgY2FyZF9yZXMtPmNvdW50X2Nv bm5lY3RvcnMgJiYKPiA+ICAJCQkgICAgcHV0X3VzZXIoY29ubmVjdG9yLT5iYXNlLmlkLCBjb25u ZWN0b3JfaWQgKyBjb3VudCkpIHsKPiA+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2RybS9kcm1fZmls ZS5oIGIvaW5jbHVkZS9kcm0vZHJtX2ZpbGUuaAo+ID4gaW5kZXggNTE3NmMzNzk3NjgwYy4uMmEw OWIzYzg5NjVjNiAxMDA2NDQKPiA+IC0tLSBhL2luY2x1ZGUvZHJtL2RybV9maWxlLmgKPiA+ICsr KyBiL2luY2x1ZGUvZHJtL2RybV9maWxlLmgKPiA+IEBAIC0xODEsNiArMTgxLDEzIEBAIHN0cnVj dCBkcm1fZmlsZSB7Cj4gPiAgCS8qKiBAYXRvbWljOiBUcnVlIGlmIGNsaWVudCB1bmRlcnN0YW5k cyBhdG9taWMgcHJvcGVydGllcy4gKi8KPiA+ICAJdW5zaWduZWQgYXRvbWljOjE7Cj4gPiAgCj4g PiArCS8qKgo+ID4gKwkgKiBAd3JpdGViYWNrX2Nvbm5lY3RvcnM6Cj4gPiArCSAqCj4gPiArCSAq IFRydWUgaWYgY2xpZW50IHVuZGVyc3RhbmRzIHdyaXRlYmFjayBjb25uZWN0b3JzCj4gPiArCSAq Lwo+ID4gKwl1bnNpZ25lZCB3cml0ZWJhY2tfY29ubmVjdG9yczoxOwo+ID4gKwo+ID4gIAkvKioK PiA+ICAJICogQGlzX21hc3RlcjoKPiA+ICAJICoKPiA+IGRpZmYgLS1naXQgYS9pbmNsdWRlL3Vh cGkvZHJtL2RybS5oIGIvaW5jbHVkZS91YXBpL2RybS9kcm0uaAo+ID4gaW5kZXggNmZkZmY1OTQ1 YzhhMC4uNTlmMjdlYTkyOGI0MiAxMDA2NDQKPiA+IC0tLSBhL2luY2x1ZGUvdWFwaS9kcm0vZHJt LmgKPiA+ICsrKyBiL2luY2x1ZGUvdWFwaS9kcm0vZHJtLmgKPiA+IEBAIC02ODAsNiArNjgwLDE1 IEBAIHN0cnVjdCBkcm1fZ2V0X2NhcCB7Cj4gPiAgICovCj4gPiAgI2RlZmluZSBEUk1fQ0xJRU5U X0NBUF9BVE9NSUMJMwo+ID4gIAo+ID4gKy8qKgo+ID4gKyAqIERSTV9DTElFTlRfQ0FQX1dSSVRF QkFDS19DT05ORUNUT1JTCj4gPiArICoKPiA+ICsgKiBJZiBzZXQgdG8gMSwgdGhlIERSTSBjb3Jl IHdpbGwgZXhwb3NlIHNwZWNpYWwgY29ubmVjdG9ycyB0byBiZSB1c2VkIGZvcgo+ID4gKyAqIHdy aXRpbmcgYmFjayB0byBtZW1vcnkgdGhlIHNjZW5lIHNldHVwIGluIHRoZSBjb21taXQuIERlcGVu ZHMgb24gY2xpZW50Cj4gPiArICogYWxzbyBzdXBwb3J0aW5nIERSTV9DTElFTlRfQ0FQX0FUT01J Qwo+ID4gKyAqLwo+ID4gKyNkZWZpbmUgRFJNX0NMSUVOVF9DQVBfV1JJVEVCQUNLX0NPTk5FQ1RP UlMJNAo+ID4gKwo+ID4gIC8qKiBEUk1fSU9DVExfU0VUX0NMSUVOVF9DQVAgaW9jdGwgYXJndW1l bnQgdHlwZSAqLwo+ID4gIHN0cnVjdCBkcm1fc2V0X2NsaWVudF9jYXAgewo+ID4gIAlfX3U2NCBj YXBhYmlsaXR5Owo+IAo+IH5NYWFydGVuCj4gCgotLSAKPT09PT09PT09PT09PT09PT09PT0KfCBJ IHdvdWxkIGxpa2UgdG8gfAp8IGZpeCB0aGUgd29ybGQsICB8CnwgYnV0IHRoZXkncmUgbm90IHwK fCBnaXZpbmcgbWUgdGhlICAgfAogXCBzb3VyY2UgY29kZSEgIC8KICAtLS0tLS0tLS0tLS0tLS0K ICAgIMKvXF8o44OEKV8vwq8KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0 b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJp LWRldmVsCg==