Commit 2af168e1 authored by Eric Anholt's avatar Eric Anholt

drm/pl111: Fix offset calculation for the primary plane.

If src_x/y were nonzero, we failed to shift them down by 16 to get the
pixel offset.  The recent CMA helper function gets it right.
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Fixes: bed41005 ("drm/pl111: Initial drm/kms driver for pl111")
Reported-by: default avatarMircea Carausu <mircea.carausu@broadcom.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170603015733.13266-1-eric@anholt.netReviewed-by: default avatarSean Paul <seanpaul@chromium.org>
parent ff9b47a0
...@@ -50,17 +50,6 @@ irqreturn_t pl111_irq(int irq, void *data) ...@@ -50,17 +50,6 @@ irqreturn_t pl111_irq(int irq, void *data)
return status; return status;
} }
static u32 pl111_get_fb_offset(struct drm_plane_state *pstate)
{
struct drm_framebuffer *fb = pstate->fb;
struct drm_gem_cma_object *obj = drm_fb_cma_get_gem_obj(fb, 0);
return (obj->paddr +
fb->offsets[0] +
fb->format->cpp[0] * pstate->src_x +
fb->pitches[0] * pstate->src_y);
}
static int pl111_display_check(struct drm_simple_display_pipe *pipe, static int pl111_display_check(struct drm_simple_display_pipe *pipe,
struct drm_plane_state *pstate, struct drm_plane_state *pstate,
struct drm_crtc_state *cstate) struct drm_crtc_state *cstate)
...@@ -73,7 +62,7 @@ static int pl111_display_check(struct drm_simple_display_pipe *pipe, ...@@ -73,7 +62,7 @@ static int pl111_display_check(struct drm_simple_display_pipe *pipe,
return -EINVAL; return -EINVAL;
if (fb) { if (fb) {
u32 offset = pl111_get_fb_offset(pstate); u32 offset = drm_fb_cma_get_gem_addr(fb, pstate, 0);
/* FB base address must be dword aligned. */ /* FB base address must be dword aligned. */
if (offset & 3) if (offset & 3)
...@@ -249,7 +238,7 @@ static void pl111_display_update(struct drm_simple_display_pipe *pipe, ...@@ -249,7 +238,7 @@ static void pl111_display_update(struct drm_simple_display_pipe *pipe,
struct drm_framebuffer *fb = pstate->fb; struct drm_framebuffer *fb = pstate->fb;
if (fb) { if (fb) {
u32 addr = pl111_get_fb_offset(pstate); u32 addr = drm_fb_cma_get_gem_addr(fb, pstate, 0);
writel(addr, priv->regs + CLCD_UBAS); writel(addr, priv->regs + CLCD_UBAS);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment