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 8A6961D042F; Wed, 2 Oct 2024 13:29:23 +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=1727875763; cv=none; b=cFxiNdCmzNUtYAjYt/ZJidU28dgZUIdoJYg9fgWKLf7gnVBHqb8MFaEZuezznrFz+t3dMjR4nvjtSD21dY0qp8DJiDxQR0WEXXQStYDrPAMMuO9wdU7J/rFDgHU6OiA/Vxj+Hm1/Y1Lkol/mXOLNkBnDgEZNhAGGZf3UOys5elI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875763; c=relaxed/simple; bh=pnJuw0XjJIJIxIUKlbba+TrasvDnmFWko/NjgkNZPJQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kw5QLUfmjlXprX/X+GO91HV7JsqraUL3fCsTwDIQud40Z1YwfdkOSVhOmM48WVcwe4L2Cnxqm0Z8wJmU3rxsy+0DqrkAkD7by3TjujzPAq/fHoY8AylNwMp3v14E0lWq5v13YUEi1FJwcycp3zcTNc5o6NQ9uqkf6hh631vD+FA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ifzFcKQT; 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="ifzFcKQT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBC9BC4CECE; Wed, 2 Oct 2024 13:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875763; bh=pnJuw0XjJIJIxIUKlbba+TrasvDnmFWko/NjgkNZPJQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ifzFcKQT+/kL5v3+QnCScXHNgJVhyU7BAHCoaGNTAReJBTtNXIGFWK4ivbZwHtBSP hgdN5pQAxc5R3K40oTVbNDFSPjyWVwXmLQyU06WypLRwM0iFFViHzDebhhtTJE48RS eYGecTbR5JOXTiSguEZP9jwV3EA1mMpbed9vVs5M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Bee , Jonas Karlman , Heiko Stuebner , Sasha Levin Subject: [PATCH 6.11 212/695] drm/rockchip: vop: Allow 4096px width scaling Date: Wed, 2 Oct 2024 14:53:30 +0200 Message-ID: <20241002125830.924996840@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Bee [ Upstream commit 0ef968d91a20b5da581839f093f98f7a03a804f7 ] There is no reason to limit VOP scaling to 3840px width, the limit of RK3288, when there are newer VOP versions that support 4096px width. Change to enforce a maximum of 4096px width plane scaling, the maximum supported output width of the VOP versions supported by this driver. Fixes: 4c156c21c794 ("drm/rockchip: vop: support plane scale") Signed-off-by: Alex Bee Signed-off-by: Jonas Karlman Signed-off-by: Heiko Stuebner Link: https://patchwork.freedesktop.org/patch/msgid/20240615170417.3134517-4-jonas@kwiboo.se Signed-off-by: Sasha Levin --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index a13473b2d54c4..4a9c6ea7f15dc 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -396,8 +396,8 @@ static void scl_vop_cal_scl_fac(struct vop *vop, const struct vop_win_data *win, if (info->is_yuv) is_yuv = true; - if (dst_w > 3840) { - DRM_DEV_ERROR(vop->dev, "Maximum dst width (3840) exceeded\n"); + if (dst_w > 4096) { + DRM_DEV_ERROR(vop->dev, "Maximum dst width (4096) exceeded\n"); return; } -- 2.43.0