From: Tobias Jakobi <liquid.acid@gmx.net>
To: Gustavo Padovan <gustavo@padovan.org>, linux-samsung-soc@vger.kernel.org
Cc: Gustavo Padovan <gustavo.padovan@collabora.co.uk>,
dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v4 09/12] drm/exynos: remove exported functions from exynos_drm_plane
Date: Sat, 09 May 2015 01:36:47 +0200 [thread overview]
Message-ID: <554D488F.2070301@gmx.net> (raw)
In-Reply-To: <1430430651-22416-10-git-send-email-gustavo@padovan.org>
Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Now that no one is using the functions exported by exynos_drm_plane due
> to the atomic conversion we can make remove some of the them or make them
> static.
>
> v2: remove unused exynos_drm_crtc
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> ---
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 90 +++++++++++++------------------
> drivers/gpu/drm/exynos/exynos_drm_plane.h | 11 ----
> 2 files changed, 37 insertions(+), 64 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.c b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> index 7d42e09..8bad40e 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
> @@ -62,35 +62,12 @@ static int exynos_plane_get_size(int start, unsigned length, unsigned last)
> return size;
> }
>
> -int exynos_check_plane(struct drm_plane *plane, struct drm_framebuffer *fb)
> -{
> - struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
> - int nr;
> - int i;
> -
> - nr = exynos_drm_fb_get_buf_cnt(fb);
> - for (i = 0; i < nr; i++) {
> - struct exynos_drm_gem_buf *buffer = exynos_drm_fb_buffer(fb, i);
> -
> - if (!buffer) {
> - DRM_DEBUG_KMS("buffer is null\n");
> - return -EFAULT;
> - }
> -
> - exynos_plane->dma_addr[i] = buffer->dma_addr;
> -
> - DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",
> - i, (unsigned long)exynos_plane->dma_addr[i]);
> - }
> -
> - return 0;
> -}
> -
> -void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
> - struct drm_framebuffer *fb, int crtc_x, int crtc_y,
> - unsigned int crtc_w, unsigned int crtc_h,
> - uint32_t src_x, uint32_t src_y,
> - uint32_t src_w, uint32_t src_h)
> +static void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
> + struct drm_framebuffer *fb,
> + int crtc_x, int crtc_y,
> + unsigned int crtc_w, unsigned int crtc_h,
> + uint32_t src_x, uint32_t src_y,
> + uint32_t src_w, uint32_t src_h)
> {
> struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
> unsigned int actual_w;
> @@ -145,24 +122,6 @@ void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
> plane->crtc = crtc;
> }
>
> -void
> -exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> - struct drm_framebuffer *fb, int crtc_x, int crtc_y,
> - unsigned int crtc_w, unsigned int crtc_h,
> - uint32_t src_x, uint32_t src_y,
> - uint32_t src_w, uint32_t src_h)
> -{
> - struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
> - struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
> -
> - exynos_plane_mode_set(plane, crtc, fb, crtc_x, crtc_y,
> - crtc_w, crtc_h, src_x >> 16, src_y >> 16,
> - src_w >> 16, src_h >> 16);
> -
> - if (exynos_crtc->ops->win_commit)
> - exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);
> -}
> -
> static struct drm_plane_funcs exynos_plane_funcs = {
> .update_plane = drm_atomic_helper_update_plane,
> .disable_plane = drm_atomic_helper_disable_plane,
> @@ -175,19 +134,44 @@ static struct drm_plane_funcs exynos_plane_funcs = {
> static int exynos_plane_atomic_check(struct drm_plane *plane,
> struct drm_plane_state *state)
> {
> - return exynos_check_plane(plane, state->fb);
> + struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
> + int nr;
> + int i;
> +
> + nr = exynos_drm_fb_get_buf_cnt(state->fb);
> + for (i = 0; i < nr; i++) {
> + struct exynos_drm_gem_buf *buffer =
> + exynos_drm_fb_buffer(state->fb, i);
> +
> + if (!buffer) {
> + DRM_DEBUG_KMS("buffer is null\n");
> + return -EFAULT;
> + }
> +
> + exynos_plane->dma_addr[i] = buffer->dma_addr;
This clashes with this commit:
https://git.kernel.org/cgit/linux/kernel/git/daeinki/drm-exynos.git/commit/?h=exynos-drm/for-next&id=40dcb441cdaaef405a2e540d496cefefdbc89ab5
> +
> + DRM_DEBUG_KMS("buffer: %d, dma_addr = 0x%lx\n",
> + i, (unsigned long)exynos_plane->dma_addr[i]);
> + }
> +
> + return 0;
> }
>
> static void exynos_plane_atomic_update(struct drm_plane *plane,
> struct drm_plane_state *old_state)
> {
> struct drm_plane_state *state = plane->state;
> + struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(state->crtc);
> + struct exynos_drm_plane *exynos_plane = to_exynos_plane(plane);
>
> - exynos_update_plane(plane, state->crtc, state->fb,
> - state->crtc_x, state->crtc_y,
> - state->crtc_w, state->crtc_h,
> - state->src_x >> 16, state->src_y >> 16,
> - state->src_w >> 16, state->src_h >> 16);
> + exynos_plane_mode_set(plane, state->crtc, state->fb,
> + state->crtc_x, state->crtc_y,
> + state->crtc_w, state->crtc_h,
> + state->src_x >> 16, state->src_y >> 16,
> + state->src_w >> 16, state->src_h >> 16);
> +
> + if (exynos_crtc->ops->win_commit)
> + exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);
> }
>
> static void exynos_plane_atomic_disable(struct drm_plane *plane,
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_plane.h b/drivers/gpu/drm/exynos/exynos_drm_plane.h
> index 560ca71..8c88ae9 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_plane.h
> +++ b/drivers/gpu/drm/exynos/exynos_drm_plane.h
> @@ -9,17 +9,6 @@
> *
> */
>
> -int exynos_check_plane(struct drm_plane *plane, struct drm_framebuffer *fb);
> -void exynos_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc,
> - struct drm_framebuffer *fb, int crtc_x, int crtc_y,
> - unsigned int crtc_w, unsigned int crtc_h,
> - uint32_t src_x, uint32_t src_y,
> - uint32_t src_w, uint32_t src_h);
> -void exynos_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
> - struct drm_framebuffer *fb, int crtc_x, int crtc_y,
> - unsigned int crtc_w, unsigned int crtc_h,
> - uint32_t src_x, uint32_t src_y,
> - uint32_t src_w, uint32_t src_h);
> int exynos_plane_init(struct drm_device *dev,
> struct exynos_drm_plane *exynos_plane,
> unsigned long possible_crtcs, enum drm_plane_type type,
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2015-05-08 23:36 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-30 21:50 drm/exynos: Add atomic modesetting support Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 01/12] drm/exynos: atomic phase 1: use drm_plane_helper_update() Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 02/12] drm/exynos: atomic phase 1: use drm_plane_helper_disable() Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 03/12] drm/exynos: atomic phase 1: add .mode_set_nofb() callback Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 04/12] drm/exynos: atomic phase 2: wire up state reset(), duplicate() and destroy() Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 05/12] drm/exynos: atomic phase 2: keep track of framebuffer pointer Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 06/12] drm/exynos: atomic phase 3: atomic updates of planes Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 07/12] drm/exynos: atomic phase 3: use atomic .set_config helper Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 08/12] drm/exynos: atomic phase 3: convert page flips Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 09/12] drm/exynos: remove exported functions from exynos_drm_plane Gustavo Padovan
2015-05-08 23:36 ` Tobias Jakobi [this message]
2015-04-30 21:50 ` [PATCH v4 10/12] drm/exynos: don't disable unused functions at init Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 11/12] drm/exynos: atomic dpms support Gustavo Padovan
2015-04-30 21:50 ` [PATCH v4 12/12] drm/exynos: remove unnecessary calls to disable_plane() Gustavo Padovan
2015-05-06 21:45 ` drm/exynos: Add atomic modesetting support Gustavo Padovan
2015-05-07 2:45 ` Inki Dae
2015-05-08 21:45 ` Gustavo Padovan
2015-05-08 21:51 ` Tobias Jakobi
2015-05-09 10:23 ` Inki Dae
2015-05-09 12:13 ` Tobias Jakobi
2015-05-09 12:20 ` Tobias Jakobi
2015-05-09 12:30 ` Tobias Jakobi
2015-05-10 13:54 ` Inki Dae
2015-05-12 18:29 ` Gustavo Padovan
2015-05-14 18:41 ` Gustavo Padovan
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=554D488F.2070301@gmx.net \
--to=liquid.acid@gmx.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavo.padovan@collabora.co.uk \
--cc=gustavo@padovan.org \
--cc=linux-samsung-soc@vger.kernel.org \
/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