Re: [PATCH 04/14] drm/imx: dc-fu: Fix dimensions
From: Frank Li <Frank.li@nxp.com>
Date: 2025-09-19 14:54:43
Also in:
dri-devel, imx, linux-devicetree, lkml
On Fri, Jul 04, 2025 at 05:03:51PM +0800, Liu Ying wrote:
Fix off-by-one issue in LINEWIDTH, LINECOUNT, FRAMEWIDTH and FRAMEHEIGHT
macro definitions. The first two macros are used to set a fetchunit's
source buffer dimension and the other two are used to set a fetchunit's
frame dimension. It appears that display controller itself works ok
without this fix, however, it enters panic mode when prefetch engine(DPRC
and PRGs) attaches to it without this fix.
Fixes: 0e177d5ce01c ("drm/imx: Add i.MX8qxp Display Controller pixel engine")
Signed-off-by: Liu Ying <victor.liu@nxp.com>Reviewed-by: Frank Li <Frank.Li@nxp.com>
quoted hunk ↗ jump to hunk
--- drivers/gpu/drm/imx/dc/dc-fu.c | 4 ++-- drivers/gpu/drm/imx/dc/dc-fu.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)diff --git a/drivers/gpu/drm/imx/dc/dc-fu.c b/drivers/gpu/drm/imx/dc/dc-fu.c index f94c591c815891468a5c2a940076963eeaa4d51c..b36d3034b8d5962eaab212b6b65ebbb5c29f978c 100644 --- a/drivers/gpu/drm/imx/dc/dc-fu.c +++ b/drivers/gpu/drm/imx/dc/dc-fu.c@@ -31,8 +31,8 @@ #define STRIDE(x) FIELD_PREP(STRIDE_MASK, (x) - 1) /* SOURCEBUFFERDIMENSION */ -#define LINEWIDTH(x) FIELD_PREP(GENMASK(13, 0), (x)) -#define LINECOUNT(x) FIELD_PREP(GENMASK(29, 16), (x)) +#define LINEWIDTH(x) FIELD_PREP(GENMASK(13, 0), (x) - 1) +#define LINECOUNT(x) FIELD_PREP(GENMASK(29, 16), (x) - 1) /* LAYEROFFSET */ #define LAYERXOFFSET(x) FIELD_PREP(GENMASK(14, 0), (x))diff --git a/drivers/gpu/drm/imx/dc/dc-fu.h b/drivers/gpu/drm/imx/dc/dc-fu.h index e016e1ea5b4e0471cf6627782603e72d0475c4e8..518d1af49f5ae9d4f67da5e6c2e80abd7e962120 100644 --- a/drivers/gpu/drm/imx/dc/dc-fu.h +++ b/drivers/gpu/drm/imx/dc/dc-fu.h@@ -38,8 +38,8 @@ #define SOURCEBUFFERENABLE BIT(31) /* FRAMEDIMENSIONS */ -#define FRAMEWIDTH(x) FIELD_PREP(GENMASK(13, 0), (x)) -#define FRAMEHEIGHT(x) FIELD_PREP(GENMASK(29, 16), (x)) +#define FRAMEWIDTH(x) FIELD_PREP(GENMASK(13, 0), (x) - 1) +#define FRAMEHEIGHT(x) FIELD_PREP(GENMASK(29, 16), (x) - 1) /* CONTROL */ #define INPUTSELECT_MASK GENMASK(4, 3) --2.34.1