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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D482C433F5 for ; Wed, 22 Dec 2021 09:06:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243686AbhLVJGB (ORCPT ); Wed, 22 Dec 2021 04:06:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232940AbhLVJF7 (ORCPT ); Wed, 22 Dec 2021 04:05:59 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5990BC061574 for ; Wed, 22 Dec 2021 01:05:59 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id p1-20020a1c7401000000b00345c2d068bdso862323wmc.3 for ; Wed, 22 Dec 2021 01:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=bu3nJO8MFxa2c3oQBbJ83GmuDcUoW/SXO45yCpT+W+biCuOoDSCSUHLDaLok8S5hJO AGIc638dQmhbYpVFO3fcT9cyc67PGfn2OhQTD/r1mPw1TTpNMQjoh0TYQr+U02yOW+tu X442JQhjJcoe+krNyki1Sg1bJOTF9j3gNtXaGIIPkZZp3cmiigPYVLCFUFLhsYanQnie TuzmHfDaVWrRYXrnE27kVoBZrfZiA2Sk8z72o7/mpw+6dFQl8nVHTQNcderx02plvF5i nSPpg9Ra28b5DwLGb8L/YCKoscQfG/MHB4XsUEBcGl83DyyOnlwlpLq4zhH15So0AFvo r8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=zFzj8gMESz7CpXbNtMwK1rL4+lOQVB/+GhCn+wTWAEOOxQx9ylUOEQ8+HOKUoMi17/ Ny/M62MZrM6J8B6YL9E9rGIu7gCEQ+pfVNEY5iGSzrtRgWvaztUvOgGNseMPGEC/ioSR KbUHgYjj0IkDtan9ujokHnMKw+LvJDKN15BqRT6XMQsRZKHqygXzKDE0HObuXBZda5E5 qDEU9AJzMNCRqGZfPNPgEGjUtcSA4cfMfme1rQt2/bga5WlBhIMRXafFkSfVZPTVYSll MPiUBWGCRAnl4kDNzYTEj6lFF9WAtZQV+OEfFl0GVe/lZvkg0xnUdQyhCMR9x19X2F2g bn6Q== X-Gm-Message-State: AOAM531paLq9PjLq/21zqHIhPqMRcvZp4sJ7SigTQltXDBOTmIMKW9bS aLgH5APuAoSeQWye6rRkjTA= X-Google-Smtp-Source: ABdhPJytwBVNsRsjyCUwyNbd1c89P3F94MwHR3ncwRrz/bBC3+610uzB064VOeAclTRMoqfrorHsTQ== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr219660wmm.8.1640163957972; Wed, 22 Dec 2021 01:05:57 -0800 (PST) Received: from localhost.localdomain ([217.113.240.86]) by smtp.gmail.com with ESMTPSA id a22sm1139775wme.19.2021.12.22.01.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 01:05:57 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: contact@emersion.fr Cc: dmitry.baryshkov@linaro.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, marex@denx.de, stefan@agner.ch, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, yannick.fertre@foss.st.com, philippe.cornu@foss.st.com, benjamin.gaignard@linaro.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v2 1/6] =?UTF-8?q?drm/plane:=20Make=20format=5Fmod=5Fsuppo?= =?UTF-8?q?rted=20truly=C2=A0optional?= Date: Wed, 22 Dec 2021 10:05:47 +0100 Message-Id: <20211222090552.25972-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211222090552.25972-1-jose.exposito89@gmail.com> References: <20211222090552.25972-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The documentation for "drm_plane_funcs.format_mod_supported" reads: This *optional* hook is used for the DRM to determine if the given format/modifier combination is valid for the plane. This allows the DRM to generate the correct format bitmask (which formats apply to which modifier), and to validate modifiers at atomic_check time. *If not present*, then any modifier in the plane's modifier list is allowed with any of the plane's formats. However, where the function is not present, an invalid IN_FORMATS blob property with modifiers but no formats is exposed to user-space. This breaks the latest Weston [1]. For testing purposes, I extracted the affected code to a standalone program [2]. Make "create_in_format_blob" behave as documented. [1] https://gitlab.freedesktop.org/wayland/weston/-/blob/9.0/libweston/backend-drm/kms.c#L431 [2] https://github.com/JoseExposito/drm-sandbox/blob/main/in_formats.c Signed-off-by: José Expósito --- drivers/gpu/drm/drm_plane.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 82afb854141b..c1186b7215ee 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -202,17 +202,13 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane memcpy(formats_ptr(blob_data), plane->format_types, formats_size); - /* If we can't determine support, just bail */ - if (!plane->funcs->format_mod_supported) - goto done; - mod = modifiers_ptr(blob_data); for (i = 0; i < plane->modifier_count; i++) { for (j = 0; j < plane->format_count; j++) { - if (plane->funcs->format_mod_supported(plane, + if (!plane->funcs->format_mod_supported || + plane->funcs->format_mod_supported(plane, plane->format_types[j], plane->modifiers[i])) { - mod->formats |= 1ULL << j; } } -- 2.25.1 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2876AC433F5 for ; Wed, 22 Dec 2021 09:06:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88FBC10FE0F; Wed, 22 Dec 2021 09:06:00 +0000 (UTC) Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6ACDA10FF49; Wed, 22 Dec 2021 09:05:59 +0000 (UTC) Received: by mail-wm1-x333.google.com with SMTP id i12so1086918wmq.4; Wed, 22 Dec 2021 01:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=bu3nJO8MFxa2c3oQBbJ83GmuDcUoW/SXO45yCpT+W+biCuOoDSCSUHLDaLok8S5hJO AGIc638dQmhbYpVFO3fcT9cyc67PGfn2OhQTD/r1mPw1TTpNMQjoh0TYQr+U02yOW+tu X442JQhjJcoe+krNyki1Sg1bJOTF9j3gNtXaGIIPkZZp3cmiigPYVLCFUFLhsYanQnie TuzmHfDaVWrRYXrnE27kVoBZrfZiA2Sk8z72o7/mpw+6dFQl8nVHTQNcderx02plvF5i nSPpg9Ra28b5DwLGb8L/YCKoscQfG/MHB4XsUEBcGl83DyyOnlwlpLq4zhH15So0AFvo r8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=AQnsA2dwZZb1ibjhIxcETyVX5OBob6IniM4RtpSX6taadInSQt6PIYpMy+VYmtpkwC ebV9CIPo0nspdP4YSQDOe61fZQf7XUxax/Lc6/cMqa12YqEzq0/Is9DWsCntBvc5aOfA cB/azTmSFGsSG55hyl/x6yVjb79fx8aijqIJ2Q6Z2Jp11sAez3qDujtlCW+MA0M/dpI2 lLxjqNWMJBLpvXHbWsO33pVYaxYSz7Pfnx/yj2F5wy9iqZicHfBzRqU+SUbL9fpSRqBA sw9aDWl8Y7Y2kDcOw4uEysdqXvKN3SYCQVfmIlsuXsNOKmjd+yuQKEWwzGZDvsBHhlIf 4bow== X-Gm-Message-State: AOAM533VDibaxPo4A/jum0vNQb3tqZY9peP857tu1ZTbgbyzPPyLvarU hzz/8DLQ5yaiuJNhxET5I0Y= X-Google-Smtp-Source: ABdhPJytwBVNsRsjyCUwyNbd1c89P3F94MwHR3ncwRrz/bBC3+610uzB064VOeAclTRMoqfrorHsTQ== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr219660wmm.8.1640163957972; Wed, 22 Dec 2021 01:05:57 -0800 (PST) Received: from localhost.localdomain ([217.113.240.86]) by smtp.gmail.com with ESMTPSA id a22sm1139775wme.19.2021.12.22.01.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 01:05:57 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: contact@emersion.fr Subject: [PATCH v2 1/6] =?UTF-8?q?drm/plane:=20Make=20format=5Fmod=5Fsuppo?= =?UTF-8?q?rted=20truly=C2=A0optional?= Date: Wed, 22 Dec 2021 10:05:47 +0100 Message-Id: <20211222090552.25972-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211222090552.25972-1-jose.exposito89@gmail.com> References: <20211222090552.25972-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, alexandre.torgue@foss.st.com, benjamin.gaignard@linaro.org, linux-stm32@st-md-mailman.stormreply.com, marex@denx.de, linux-imx@nxp.com, intel-gfx@lists.freedesktop.org, tzimmermann@suse.de, s.hauer@pengutronix.de, rodrigo.vivi@intel.com, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, yannick.fertre@foss.st.com, linux-kernel@vger.kernel.org, philippe.cornu@foss.st.com, mcoquelin.stm32@gmail.com, dmitry.baryshkov@linaro.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , shawnguo@kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The documentation for "drm_plane_funcs.format_mod_supported" reads: This *optional* hook is used for the DRM to determine if the given format/modifier combination is valid for the plane. This allows the DRM to generate the correct format bitmask (which formats apply to which modifier), and to validate modifiers at atomic_check time. *If not present*, then any modifier in the plane's modifier list is allowed with any of the plane's formats. However, where the function is not present, an invalid IN_FORMATS blob property with modifiers but no formats is exposed to user-space. This breaks the latest Weston [1]. For testing purposes, I extracted the affected code to a standalone program [2]. Make "create_in_format_blob" behave as documented. [1] https://gitlab.freedesktop.org/wayland/weston/-/blob/9.0/libweston/backend-drm/kms.c#L431 [2] https://github.com/JoseExposito/drm-sandbox/blob/main/in_formats.c Signed-off-by: José Expósito --- drivers/gpu/drm/drm_plane.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 82afb854141b..c1186b7215ee 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -202,17 +202,13 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane memcpy(formats_ptr(blob_data), plane->format_types, formats_size); - /* If we can't determine support, just bail */ - if (!plane->funcs->format_mod_supported) - goto done; - mod = modifiers_ptr(blob_data); for (i = 0; i < plane->modifier_count; i++) { for (j = 0; j < plane->format_count; j++) { - if (plane->funcs->format_mod_supported(plane, + if (!plane->funcs->format_mod_supported || + plane->funcs->format_mod_supported(plane, plane->format_types[j], plane->modifiers[i])) { - mod->formats |= 1ULL << j; } } -- 2.25.1 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 68F51C433EF for ; Wed, 22 Dec 2021 09:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TJglTjzrqc5GaQpxx+AwOWc8AuSvhDLjcJhYV99HZQc=; b=GtH9ldJspFTqAC mt0AAbHEhM9oh3Il61+lYKXOOtPPM9t16FswuYGDA6U6nVKN7B7BEg5a+bWBgX17k7W9x1iSD2zMA BF4C98KfF8vbKQEqwsMHdHyjLjqax4XCD2XDq4XFVLNcj+n71TkI5JGfBmQphXAtS7O2xqL0y57yu WxSBPV5IpJ434PgqzrwNIWVAQqb3fPMhnJrj28k9OaV2Gg20CLQeQ25R/kq5/pD/+aV1T8k14nsQF BBwBQELl/CYxJ/QUxBdU04QI7khMA51YV1qQh/ZtejuYJl9NF3pS4OS4XDyDaxSLCElijEnHE5oMp +5PZowBDzq6sLgx+2O3A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzxZe-009okp-2z; Wed, 22 Dec 2021 09:06:14 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mzxZP-009oe2-LI for linux-arm-kernel@lists.infradead.org; Wed, 22 Dec 2021 09:06:01 +0000 Received: by mail-wm1-x334.google.com with SMTP id bg19-20020a05600c3c9300b0034565e837b6so1985459wmb.1 for ; Wed, 22 Dec 2021 01:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=bu3nJO8MFxa2c3oQBbJ83GmuDcUoW/SXO45yCpT+W+biCuOoDSCSUHLDaLok8S5hJO AGIc638dQmhbYpVFO3fcT9cyc67PGfn2OhQTD/r1mPw1TTpNMQjoh0TYQr+U02yOW+tu X442JQhjJcoe+krNyki1Sg1bJOTF9j3gNtXaGIIPkZZp3cmiigPYVLCFUFLhsYanQnie TuzmHfDaVWrRYXrnE27kVoBZrfZiA2Sk8z72o7/mpw+6dFQl8nVHTQNcderx02plvF5i nSPpg9Ra28b5DwLGb8L/YCKoscQfG/MHB4XsUEBcGl83DyyOnlwlpLq4zhH15So0AFvo r8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=S4bsplxseyRmPXmSlPy6+37GhQrDOmPeXPuALxnHg0yfS0L1vla+YfOn0qTCYUsejj VNsgU3578lAXMgdc/y7bmMIBuJrXycbp1JeEPWt9gxqyzMdVVHkPSI8wrgVNKWmpxSnW DIv05hJmXztnl/JUV6Awh42oSZi5H7ScsJdur3zZCymiLDFVDSXxGLQyYZh5NPA+oiNq bhyscdzfEmpdXUeznwsld0X2BL7IbO6FCOJa742cwoyA37vhHU5sLAOlRltPIy4h9OBf X96mQ8Nus35y5PmuWy9pCt2uRs6ZbU5UBCx3+Loc+4bCVaD+z9b6JxUVPPl2/4j+7vdt G7Kw== X-Gm-Message-State: AOAM532pTfNfIThIsvKVKd1i8d5zMma5bKxLkG96AteNntTkf5xLDIhi jDzDvRfATpZyJ1vQ+n5M2IY0hzJtvK++Eg== X-Google-Smtp-Source: ABdhPJytwBVNsRsjyCUwyNbd1c89P3F94MwHR3ncwRrz/bBC3+610uzB064VOeAclTRMoqfrorHsTQ== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr219660wmm.8.1640163957972; Wed, 22 Dec 2021 01:05:57 -0800 (PST) Received: from localhost.localdomain ([217.113.240.86]) by smtp.gmail.com with ESMTPSA id a22sm1139775wme.19.2021.12.22.01.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 01:05:57 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: contact@emersion.fr Cc: dmitry.baryshkov@linaro.org, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@linux.ie, daniel@ffwll.ch, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, marex@denx.de, stefan@agner.ch, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, yannick.fertre@foss.st.com, philippe.cornu@foss.st.com, benjamin.gaignard@linaro.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v2 1/6] =?UTF-8?q?drm/plane:=20Make=20format=5Fmod=5Fsuppo?= =?UTF-8?q?rted=20truly=C2=A0optional?= Date: Wed, 22 Dec 2021 10:05:47 +0100 Message-Id: <20211222090552.25972-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211222090552.25972-1-jose.exposito89@gmail.com> References: <20211222090552.25972-1-jose.exposito89@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211222_010559_728261_89EB4066 X-CRM114-Status: GOOD ( 15.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org VGhlIGRvY3VtZW50YXRpb24gZm9yICJkcm1fcGxhbmVfZnVuY3MuZm9ybWF0X21vZF9zdXBwb3J0 ZWQiIHJlYWRzOgoKICBUaGlzICpvcHRpb25hbCogaG9vayBpcyB1c2VkIGZvciB0aGUgRFJNIHRv IGRldGVybWluZSBpZiB0aGUgZ2l2ZW4KICBmb3JtYXQvbW9kaWZpZXIgY29tYmluYXRpb24gaXMg dmFsaWQgZm9yIHRoZSBwbGFuZS4gVGhpcyBhbGxvd3MgdGhlCiAgRFJNIHRvIGdlbmVyYXRlIHRo ZSBjb3JyZWN0IGZvcm1hdCBiaXRtYXNrICh3aGljaCBmb3JtYXRzIGFwcGx5IHRvCiAgd2hpY2gg bW9kaWZpZXIpLCBhbmQgdG8gdmFsaWRhdGUgbW9kaWZpZXJzIGF0IGF0b21pY19jaGVjayB0aW1l LgoKICAqSWYgbm90IHByZXNlbnQqLCB0aGVuIGFueSBtb2RpZmllciBpbiB0aGUgcGxhbmUncyBt b2RpZmllcgogIGxpc3QgaXMgYWxsb3dlZCB3aXRoIGFueSBvZiB0aGUgcGxhbmUncyBmb3JtYXRz LgoKSG93ZXZlciwgd2hlcmUgdGhlIGZ1bmN0aW9uIGlzIG5vdCBwcmVzZW50LCBhbiBpbnZhbGlk IElOX0ZPUk1BVFMgYmxvYgpwcm9wZXJ0eSB3aXRoIG1vZGlmaWVycyBidXQgbm8gZm9ybWF0cyBp cyBleHBvc2VkIHRvIHVzZXItc3BhY2UuCgpUaGlzIGJyZWFrcyB0aGUgbGF0ZXN0IFdlc3RvbiBb MV0uIEZvciB0ZXN0aW5nIHB1cnBvc2VzLCBJIGV4dHJhY3RlZCB0aGUKYWZmZWN0ZWQgY29kZSB0 byBhIHN0YW5kYWxvbmUgcHJvZ3JhbSBbMl0uCgpNYWtlICJjcmVhdGVfaW5fZm9ybWF0X2Jsb2Ii IGJlaGF2ZSBhcyBkb2N1bWVudGVkLgoKWzFdIGh0dHBzOi8vZ2l0bGFiLmZyZWVkZXNrdG9wLm9y Zy93YXlsYW5kL3dlc3Rvbi8tL2Jsb2IvOS4wL2xpYndlc3Rvbi9iYWNrZW5kLWRybS9rbXMuYyNM NDMxClsyXSBodHRwczovL2dpdGh1Yi5jb20vSm9zZUV4cG9zaXRvL2RybS1zYW5kYm94L2Jsb2Iv bWFpbi9pbl9mb3JtYXRzLmMKClNpZ25lZC1vZmYtYnk6IEpvc8OpIEV4cMOzc2l0byA8am9zZS5l eHBvc2l0bzg5QGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vZHJtX3BsYW5lLmMgfCA4 ICsrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9kcm1fcGxhbmUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9kcm1fcGxhbmUuYwppbmRleCA4MmFmYjg1NDE0MWIuLmMxMTg2YjcyMTVlZSAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9wbGFuZS5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1fcGxhbmUuYwpAQCAtMjAyLDE3ICsyMDIsMTMgQEAgc3RhdGljIGludCBjcmVhdGVfaW5fZm9y bWF0X2Jsb2Ioc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9wbGFuZSAqcGxhbmUK IAogCW1lbWNweShmb3JtYXRzX3B0cihibG9iX2RhdGEpLCBwbGFuZS0+Zm9ybWF0X3R5cGVzLCBm b3JtYXRzX3NpemUpOwogCi0JLyogSWYgd2UgY2FuJ3QgZGV0ZXJtaW5lIHN1cHBvcnQsIGp1c3Qg YmFpbCAqLwotCWlmICghcGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9kX3N1cHBvcnRlZCkKLQkJZ290 byBkb25lOwotCiAJbW9kID0gbW9kaWZpZXJzX3B0cihibG9iX2RhdGEpOwogCWZvciAoaSA9IDA7 IGkgPCBwbGFuZS0+bW9kaWZpZXJfY291bnQ7IGkrKykgewogCQlmb3IgKGogPSAwOyBqIDwgcGxh bmUtPmZvcm1hdF9jb3VudDsgaisrKSB7Ci0JCQlpZiAocGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9k X3N1cHBvcnRlZChwbGFuZSwKKwkJCWlmICghcGxhbmUtPmZ1bmNzLT5mb3JtYXRfbW9kX3N1cHBv cnRlZCB8fAorCQkJICAgIHBsYW5lLT5mdW5jcy0+Zm9ybWF0X21vZF9zdXBwb3J0ZWQocGxhbmUs CiAJCQkJCQkJICAgICAgIHBsYW5lLT5mb3JtYXRfdHlwZXNbal0sCiAJCQkJCQkJICAgICAgIHBs YW5lLT5tb2RpZmllcnNbaV0pKSB7Ci0KIAkJCQltb2QtPmZvcm1hdHMgfD0gMVVMTCA8PCBqOwog CQkJfQogCQl9Ci0tIAoyLjI1LjEKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdApsaW51eC1hcm0ta2Vy bmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1h bi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg== 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C902CC433F5 for ; Mon, 10 Jan 2022 13:24:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 08E11113B36; Mon, 10 Jan 2022 13:24:47 +0000 (UTC) Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6ACDA10FF49; Wed, 22 Dec 2021 09:05:59 +0000 (UTC) Received: by mail-wm1-x333.google.com with SMTP id i12so1086918wmq.4; Wed, 22 Dec 2021 01:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=bu3nJO8MFxa2c3oQBbJ83GmuDcUoW/SXO45yCpT+W+biCuOoDSCSUHLDaLok8S5hJO AGIc638dQmhbYpVFO3fcT9cyc67PGfn2OhQTD/r1mPw1TTpNMQjoh0TYQr+U02yOW+tu X442JQhjJcoe+krNyki1Sg1bJOTF9j3gNtXaGIIPkZZp3cmiigPYVLCFUFLhsYanQnie TuzmHfDaVWrRYXrnE27kVoBZrfZiA2Sk8z72o7/mpw+6dFQl8nVHTQNcderx02plvF5i nSPpg9Ra28b5DwLGb8L/YCKoscQfG/MHB4XsUEBcGl83DyyOnlwlpLq4zhH15So0AFvo r8sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4JUlyn+OB9q/nAkx157+4tz8tby5UzCmjnk2cgpU7/E=; b=AQnsA2dwZZb1ibjhIxcETyVX5OBob6IniM4RtpSX6taadInSQt6PIYpMy+VYmtpkwC ebV9CIPo0nspdP4YSQDOe61fZQf7XUxax/Lc6/cMqa12YqEzq0/Is9DWsCntBvc5aOfA cB/azTmSFGsSG55hyl/x6yVjb79fx8aijqIJ2Q6Z2Jp11sAez3qDujtlCW+MA0M/dpI2 lLxjqNWMJBLpvXHbWsO33pVYaxYSz7Pfnx/yj2F5wy9iqZicHfBzRqU+SUbL9fpSRqBA sw9aDWl8Y7Y2kDcOw4uEysdqXvKN3SYCQVfmIlsuXsNOKmjd+yuQKEWwzGZDvsBHhlIf 4bow== X-Gm-Message-State: AOAM533VDibaxPo4A/jum0vNQb3tqZY9peP857tu1ZTbgbyzPPyLvarU hzz/8DLQ5yaiuJNhxET5I0Y= X-Google-Smtp-Source: ABdhPJytwBVNsRsjyCUwyNbd1c89P3F94MwHR3ncwRrz/bBC3+610uzB064VOeAclTRMoqfrorHsTQ== X-Received: by 2002:a05:600c:c6:: with SMTP id u6mr219660wmm.8.1640163957972; Wed, 22 Dec 2021 01:05:57 -0800 (PST) Received: from localhost.localdomain ([217.113.240.86]) by smtp.gmail.com with ESMTPSA id a22sm1139775wme.19.2021.12.22.01.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 01:05:57 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: contact@emersion.fr Date: Wed, 22 Dec 2021 10:05:47 +0100 Message-Id: <20211222090552.25972-2-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211222090552.25972-1-jose.exposito89@gmail.com> References: <20211222090552.25972-1-jose.exposito89@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Mon, 10 Jan 2022 13:24:14 +0000 Subject: [Intel-gfx] =?utf-8?q?=5BPATCH_v2_1/6=5D_drm/plane=3A_Make_forma?= =?utf-8?q?t=5Fmod=5Fsupported_truly=C2=A0optional?= X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, alexandre.torgue@foss.st.com, stefan@agner.ch, benjamin.gaignard@linaro.org, festevam@gmail.com, linux-stm32@st-md-mailman.stormreply.com, marex@denx.de, linux-imx@nxp.com, intel-gfx@lists.freedesktop.org, tzimmermann@suse.de, s.hauer@pengutronix.de, mripard@kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, yannick.fertre@foss.st.com, linux-kernel@vger.kernel.org, philippe.cornu@foss.st.com, mcoquelin.stm32@gmail.com, dmitry.baryshkov@linaro.org, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , shawnguo@kernel.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The documentation for "drm_plane_funcs.format_mod_supported" reads: This *optional* hook is used for the DRM to determine if the given format/modifier combination is valid for the plane. This allows the DRM to generate the correct format bitmask (which formats apply to which modifier), and to validate modifiers at atomic_check time. *If not present*, then any modifier in the plane's modifier list is allowed with any of the plane's formats. However, where the function is not present, an invalid IN_FORMATS blob property with modifiers but no formats is exposed to user-space. This breaks the latest Weston [1]. For testing purposes, I extracted the affected code to a standalone program [2]. Make "create_in_format_blob" behave as documented. [1] https://gitlab.freedesktop.org/wayland/weston/-/blob/9.0/libweston/backend-drm/kms.c#L431 [2] https://github.com/JoseExposito/drm-sandbox/blob/main/in_formats.c Signed-off-by: José Expósito --- drivers/gpu/drm/drm_plane.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 82afb854141b..c1186b7215ee 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -202,17 +202,13 @@ static int create_in_format_blob(struct drm_device *dev, struct drm_plane *plane memcpy(formats_ptr(blob_data), plane->format_types, formats_size); - /* If we can't determine support, just bail */ - if (!plane->funcs->format_mod_supported) - goto done; - mod = modifiers_ptr(blob_data); for (i = 0; i < plane->modifier_count; i++) { for (j = 0; j < plane->format_count; j++) { - if (plane->funcs->format_mod_supported(plane, + if (!plane->funcs->format_mod_supported || + plane->funcs->format_mod_supported(plane, plane->format_types[j], plane->modifiers[i])) { - mod->formats |= 1ULL << j; } } -- 2.25.1