drm/msm: Fix fb plane offset calculation

robclark · robclark · commit cec4e5cbb91b · 2022-05-18T10:55:47.000-07:00
The offset got dropped by accident. Fixes: d413e6f ("drm/msm: Drop msm_gem_iova()") Signed-off-by: Rob Clark <robdclark@chromium.org> Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> Tested-by: Stephen Boyd <swboyd@chromium.org> # CoachZ Link: https://lore.kernel.org/r/20220510165216.3577068-1-robdclark@gmail.com Signed-off-by: Rob Clark <robdclark@chromium.org>
diff --git a/drivers/gpu/drm/msm/msm_fb.c b/drivers/gpu/drm/msm/msm_fb.c
@@ -118,7 +118,7 @@ uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb,
 		struct msm_gem_address_space *aspace, int plane)
 {
 	struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);
-	return msm_fb->iova[plane];
+	return msm_fb->iova[plane] + fb->offsets[plane];
 }
 
 struct drm_gem_object *msm_framebuffer_bo(struct drm_framebuffer *fb, int plane)

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ uint32_t msm_framebuffer_iova(struct drm_framebuffer *fb,`
`118`	`118`	`struct msm_gem_address_space *aspace, int plane)`
`119`	`119`	`{`
`120`	`120`	`struct msm_framebuffer *msm_fb = to_msm_framebuffer(fb);`
`121`		`- return msm_fb->iova[plane];`
	`121`	`+ return msm_fb->iova[plane] + fb->offsets[plane];`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`struct drm_gem_object msm_framebuffer_bo(struct drm_framebuffer fb, int plane)`