From: Chen-Yu Tsai <wens@csie.org>
To: Maxime Ripard <maxime.ripard@free-electrons.com>,
David Airlie <airlied@linux.ie>
Cc: Chen-Yu Tsai <wens@csie.org>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
linux-sunxi@googlegroups.com
Subject: [PATCH 3/7] drm/sun4i: backend: Use drm_fb_cma_get_gem_addr() to get display memory
Date: Sat, 14 Oct 2017 12:02:48 +0800 [thread overview]
Message-ID: <20171014040252.9621-4-wens@csie.org> (raw)
In-Reply-To: <20171014040252.9621-1-wens@csie.org>
Commit 4636ce93d5b2 ("drm/fb-cma-helper: Add drm_fb_cma_get_gem_addr()")
adds a new helper, which covers fetching a drm_framebuffer's GEM object
and calculating the buffer address for a given plane.
This patch uses this helper to replace our own open coded version of the
same function.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
drivers/gpu/drm/sun4i/sun4i_backend.c | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 1cc1780f5091..243ddfdc9403 100644
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -209,22 +209,11 @@ int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
{
struct drm_plane_state *state = plane->state;
struct drm_framebuffer *fb = state->fb;
- struct drm_gem_cma_object *gem;
u32 lo_paddr, hi_paddr;
dma_addr_t paddr;
- int bpp;
-
- /* Get the physical address of the buffer in memory */
- gem = drm_fb_cma_get_gem_obj(fb, 0);
-
- DRM_DEBUG_DRIVER("Using GEM @ %pad\n", &gem->paddr);
-
- /* Compute the start of the displayed memory */
- bpp = fb->format->cpp[0];
- paddr = gem->paddr + fb->offsets[0];
- paddr += (state->src_x >> 16) * bpp;
- paddr += (state->src_y >> 16) * fb->pitches[0];
+ /* Get the start of the displayed memory */
+ paddr = drm_fb_cma_get_gem_addr(fb, state, 0);
DRM_DEBUG_DRIVER("Setting buffer address to %pad\n", &paddr);
/* Write the 32 lower bits of the address (in bits) */
--
2.14.2
next prev parent reply other threads:[~2017-10-14 4:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-14 4:02 [PATCH 0/7] drm/sun4i: More cleanups Chen-Yu Tsai
2017-10-14 4:02 ` [PATCH 1/7] drm/sun4i: don't add components that are already in the queue Chen-Yu Tsai
2017-10-14 4:02 ` [PATCH 2/7] drm/sun4i: backend: Create regmap after access is possible Chen-Yu Tsai
2017-10-14 4:02 ` Chen-Yu Tsai [this message]
2017-10-14 4:02 ` [PATCH 4/7] drm/sun4i: backend: Add comment explaining why registers are cleared Chen-Yu Tsai
2017-10-14 4:02 ` [PATCH 5/7] drm/sun4i: backend: Offset layer buffer address by DRAM starting address Chen-Yu Tsai
2017-10-16 8:00 ` Maxime Ripard
2017-10-16 8:20 ` [linux-sunxi] " Chen-Yu Tsai
2017-10-16 20:15 ` Maxime Ripard
2017-10-17 3:40 ` Chen-Yu Tsai
2017-10-16 9:42 ` icenowy
2017-10-14 4:02 ` [PATCH 6/7] drm/sun4i: hdmi: Document PAD_CTRL1 output invert bits Chen-Yu Tsai
2017-10-14 4:02 ` [PATCH 7/7] drm/sun4i: hdmi: Move PAD_CTRL1 setting to mode_set function Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171014040252.9621-4-wens@csie.org \
--to=wens@csie.org \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®