From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8421715198D; Wed, 5 Feb 2025 14:04:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764255; cv=none; b=spBkiaHdyWmsFWSGlGNxyOgpg1tRcbbt5BjhMBQ5TCvY3IgAz+W4WsgZ9kYxQZiPCXOZ99tqXVwa2lYQwfa+za2zeeX8r9/I5aYidD+gbqypwNzUc2ji6wwn+sQEXeTbA1Gp53xSz8QeohILhJWAEOcvXPi0u+MlmDxRERkuY8s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764255; c=relaxed/simple; bh=o0d/A51K327xyZPGI+PygNacquggYB6qgTZAafxxynM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=psgrI4WIkhrOP6aXDoid1++zeBZi5bLDRrUcBe1HNTR30BH1saO7w0IZvAJChR7KlsqN715zcV9xtL6/lodEETkMhx+g3KAXtsBnImhU9zgPn3DsXW6o6/n2FfKPVb5ukndweDJrCVKzoHuwPsQyiCnBVkWCeqXfaHkfWpIKWmo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dN+3mbrU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="dN+3mbrU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0EACC4CED1; Wed, 5 Feb 2025 14:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764255; bh=o0d/A51K327xyZPGI+PygNacquggYB6qgTZAafxxynM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dN+3mbrU8EYGnU4Z3c4S2/oX/Y44pqGnoKhmGJcLQhicycX58lyen22iVLG2YLwkf i5gEoRQ4CuVPr7FeHWEJfoeVw1j/PO38cDqcZka5NLjhKsoVv5W5KgSy1qO+SzYsRS IpziHr+ILkmsiUEAotp9Mv5KtcOuxbaGGnivcUbc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andy Yan , Heiko Stuebner , Sasha Levin Subject: [PATCH 6.13 061/623] drm/rockchip: vop2: Add check for 32 bpp format for rk3588 Date: Wed, 5 Feb 2025 14:36:43 +0100 Message-ID: <20250205134458.560364111@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andy Yan [ Upstream commit 7e8a56c703c67bfa8d3f71a0c1c297bb1252b897 ] RK3588 only support DRM_FORMAT_XRGB2101010/XBGR2101010 in afbc mode. Fixes: 5a028e8f062f ("drm/rockchip: vop2: Add support for rk3588") Signed-off-by: Andy Yan Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20241214081719.3330518-7-andyshrk@163.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 2abc68fe2d1ff..6082b1c179aeb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -560,6 +560,15 @@ static bool rockchip_vop2_mod_supported(struct drm_plane *plane, u32 format, } } + if (format == DRM_FORMAT_XRGB2101010 || format == DRM_FORMAT_XBGR2101010) { + if (vop2->data->soc_id == 3588) { + if (!rockchip_afbc(plane, modifier)) { + drm_dbg_kms(vop2->drm, "Only support 32 bpp format with afbc\n"); + return false; + } + } + } + if (modifier == DRM_FORMAT_MOD_LINEAR) return true; -- 2.39.5