From 0a727b459ee39bd4c5ced19d6024258ac87b6b2e Mon Sep 17 00:00:00 2001

From: Xianting Tian <xianting.tian@linux.alibaba.com>

Date: Wed, 12 Jan 2022 20:33:34 +0800

Subject: [PATCH] drm/msm: Fix wrong size calculation

Git-commit: 0a727b459ee39bd4c5ced19d6024258ac87b6b2e

Patch-mainline: v5.17-rc2

References: git-fixes

For example, memory-region in .dts as below,

	reg = <0x0 0x50000000 0x0 0x20000000>

We can get below values,

struct resource r;

r.start = 0x50000000;

r.end	= 0x6fffffff;

So the size should be:

size = r.end - r.start + 1 = 0x20000000

Signed-off-by: Xianting Tian <xianting.tian@linux.alibaba.com>

Fixes: 072f1f9168ed ("drm/msm: add support for "stolen" mem")

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Link: https://lore.kernel.org/r/20220112123334.749776-1-xianting.tian@linux.alibaba.com

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Acked-by: Takashi Iwai <tiwai@suse.de>

---

 drivers/gpu/drm/msm/msm_drv.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c

index 59e30192cdf6..555666e3f960 100644

--- a/drivers/gpu/drm/msm/msm_drv.c

+++ b/drivers/gpu/drm/msm/msm_drv.c

@@ -461,7 +461,7 @@ static int msm_init_vram(struct drm_device *dev)

 		of_node_put(node);

 		if (ret)

 			return ret;

-		size = r.end - r.start;

+		size = r.end - r.start + 1;

 		DRM_INFO("using VRAM carveout: %lx@%pa\n", size, &r.start);

 		/* if we have no IOMMU, then we need to use carveout allocator.

-- 

2.31.1