From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 113/123] drm: Auto-set allow_fb_modifiers when given modifiers at plane init Date: Wed, 27 Mar 2019 14:16:17 -0400 Message-ID: <20190327181628.15899-113-sashal@kernel.org> References: <20190327181628.15899-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 440B189E9B for ; Wed, 27 Mar 2019 18:20:18 +0000 (UTC) In-Reply-To: <20190327181628.15899-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paul Kocialkowski , Maxime Ripard , dri-devel@lists.freedesktop.org, Sasha Levin List-Id: dri-devel@lists.freedesktop.org RnJvbTogUGF1bCBLb2NpYWxrb3dza2kgPHBhdWwua29jaWFsa293c2tpQGJvb3RsaW4uY29tPgoK WyBVcHN0cmVhbSBjb21taXQgODkwODgwZGRmZGJlMjU2MDgzMTcwODY2ZTQ5Yzg3NjE4YjcwNmFj NyBdCgpXaGVuIGRyaXZlcnMgcGFzcyBub24tZW1wdHkgbGlzdHMgb2YgbW9kaWZpZXJzIGZvciBp bml0aWFsaXppbmcgdGhlaXIKcGxhbmVzLCB3ZSBjYW4gaW5mZXIgdGhhdCB0aGV5IGFsbG93IGZy YW1lYnVmZmVyIG1vZGlmaWVycyBhbmQgc2V0IHRoZQpkcml2ZXIncyBhbGxvd19mYl9tb2RpZmll cnMgbW9kZSBjb25maWcgZWxlbWVudC4KCkluIGNhc2UgdGhlIGFsbG93X2ZiX21vZGlmaWVycyBl bGVtZW50IHdhcyBub3Qgc2V0IChzb21lIGRyaXZlcnMgdGVuZAp0byBzZXQgdGhlbSBhZnRlciBy ZWdpc3RlcmluZyBwbGFuZXMpLCB0aGUgbW9kaWZpZXJzIHdpbGwgc3RpbGwgYmUKcmVnaXN0ZXJl ZCBidXQgd29uJ3QgYmUgYXZhaWxhYmxlIHRvIHVzZXJzcGFjZSB1bmxlc3MgdGhlIGZsYWcgaXMg c2V0CmxhdGVyLiBIb3dldmVyIGluIHRoYXQgY2FzZSwgdGhlIElOX0ZPUk1BVFMgYmxvYiB3b24n dCBiZSBjcmVhdGVkLgoKSW4gb3JkZXIgdG8gYXZvaWQgdGhpcyBjYXNlIGFuZCBnZW5lcmFsbHkg cmVkdWNlIHRoZSB0cm91YmxlIGFzc29jaWF0ZWQKd2l0aCB0aGUgZmxhZywgYWx3YXlzIHNldCBh bGxvd19mYl9tb2RpZmllcnMgd2hlbiBhIG5vbi1lbXB0eSBsaXN0IG9mCmZvcm1hdCBtb2RpZmll cnMgaXMgcGFzc2VkIGF0IHBsYW5lIGluaXQuCgpSZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8 ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KU2lnbmVkLW9mZi1ieTogUGF1bCBLb2NpYWxrb3dza2kg PHBhdWwua29jaWFsa293c2tpQGJvb3RsaW4uY29tPgpTaWduZWQtb2ZmLWJ5OiBNYXhpbWUgUmlw YXJkIDxtYXhpbWUucmlwYXJkQGJvb3RsaW4uY29tPgpMaW5rOiBodHRwczovL3BhdGNod29yay5m cmVlZGVza3RvcC5vcmcvcGF0Y2gvbXNnaWQvMjAxOTAxMDQwODU2MTAuNTgyOS0xLXBhdWwua29j aWFsa293c2tpQGJvb3RsaW4uY29tClNpZ25lZC1vZmYtYnk6IFNhc2hhIExldmluIDxzYXNoYWxA a2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgfCAzICsrKwogMSBm aWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2Ry bS9kcm1fcGxhbmUuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwppbmRleCA3YTAwMzUx ZDViNWQuLjcxMTg2YmY5MDc2MCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFu ZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYwpAQCAtMjAzLDYgKzIwMyw5IEBA IGludCBkcm1fdW5pdmVyc2FsX3BsYW5lX2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3Ry dWN0IGRybV9wbGFuZSAqcGxhbmUsCiAJCQlmb3JtYXRfbW9kaWZpZXJfY291bnQrKzsKIAl9CiAK KwlpZiAoZm9ybWF0X21vZGlmaWVyX2NvdW50KQorCQljb25maWctPmFsbG93X2ZiX21vZGlmaWVy cyA9IHRydWU7CisKIAlwbGFuZS0+bW9kaWZpZXJfY291bnQgPSBmb3JtYXRfbW9kaWZpZXJfY291 bnQ7CiAJcGxhbmUtPm1vZGlmaWVycyA9IGttYWxsb2NfYXJyYXkoZm9ybWF0X21vZGlmaWVyX2Nv dW50LAogCQkJCQkgc2l6ZW9mKGZvcm1hdF9tb2RpZmllcnNbMF0pLAotLSAKMi4xOS4xCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWw= 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E136CC4360F for ; Wed, 27 Mar 2019 18:46:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC791205C9 for ; Wed, 27 Mar 2019 18:46:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553712392; bh=VMRfwbAB08X04V1pPVpgGIVuECQJ+B+zMe85QbcnTBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=huwo7FMreKyLR6qZ7RwO8fXJzpAS8pgKLrKH4aGbZZgaKL5NPyxDTvL7jwbvWha5O APJgQ1IqrJrj4rcoBZxm94AnGyQVvXrs6FqHAPcGxviJ2IotFQnk34l1f+Q5rlabO9 qx5qUIbTHfcIfteyn89VHJ6GEDF/rTlxHoeyAw9g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390906AbfC0SU1 (ORCPT ); Wed, 27 Mar 2019 14:20:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:37784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390641AbfC0SUT (ORCPT ); Wed, 27 Mar 2019 14:20:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C0C520651; Wed, 27 Mar 2019 18:20:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553710818; bh=VMRfwbAB08X04V1pPVpgGIVuECQJ+B+zMe85QbcnTBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ypdD1J5lCb2UPfK0uDcnz4Wy79KmvQOEEYWzwnbvT3OvkV0GH9ws9IM79LctjubeA Gzdj6vKSoCM/oMXwaX+X9ELRJuPjTha3sUTAV6/BxFqTG0FfWGBGnPialE6zycisJF jjA7FID6AcbG5WaR6CudUf/VAZhrPXef6lT30N+Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Paul Kocialkowski , Maxime Ripard , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.14 113/123] drm: Auto-set allow_fb_modifiers when given modifiers at plane init Date: Wed, 27 Mar 2019 14:16:17 -0400 Message-Id: <20190327181628.15899-113-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327181628.15899-1-sashal@kernel.org> References: <20190327181628.15899-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paul Kocialkowski [ Upstream commit 890880ddfdbe256083170866e49c87618b706ac7 ] When drivers pass non-empty lists of modifiers for initializing their planes, we can infer that they allow framebuffer modifiers and set the driver's allow_fb_modifiers mode config element. In case the allow_fb_modifiers element was not set (some drivers tend to set them after registering planes), the modifiers will still be registered but won't be available to userspace unless the flag is set later. However in that case, the IN_FORMATS blob won't be created. In order to avoid this case and generally reduce the trouble associated with the flag, always set allow_fb_modifiers when a non-empty list of format modifiers is passed at plane init. Reviewed-by: Daniel Vetter Signed-off-by: Paul Kocialkowski Signed-off-by: Maxime Ripard Link: https://patchwork.freedesktop.org/patch/msgid/20190104085610.5829-1-paul.kocialkowski@bootlin.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_plane.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 7a00351d5b5d..71186bf90760 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -203,6 +203,9 @@ int drm_universal_plane_init(struct drm_device *dev, struct drm_plane *plane, format_modifier_count++; } + if (format_modifier_count) + config->allow_fb_modifiers = true; + plane->modifier_count = format_modifier_count; plane->modifiers = kmalloc_array(format_modifier_count, sizeof(format_modifiers[0]), -- 2.19.1