Re: [PATCH 05/10] drm/i915: Remove legacy plane updates for cursor and sprite planes.

Daniel Vetter
2015-09-10T15:35:49Z

On Thu, Sep 10, 2015 at 04:08:00PM +0200, Maarten Lankhorst wrote:
> Unfortunately fbc still depends on legacy primary state, so
> it can't be killed off completely yet.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Wont it be enough that the helpers will update these legacy states for us?
And I didn't spot anything else really using them ...

What I did spot though is update_state_fb - the core should take care of
that now too for us since

commit 3cb43cc0b408c4672ba94fe28406a90a94b1edfe
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue Jul 7 08:43:03 2015 +0200

drm: Update plane->fb also for page_flip

Can you please have a testcase on top to remove this one too?
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 4 ----
> drivers/gpu/drm/i915/intel_sprite.c | 2 --
> 2 files changed, 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index bad22cb828c0..87c5eba08454 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -13662,10 +13662,6 @@ intel_commit_cursor_plane(struct drm_plane *plane,
> crtc = crtc ? crtc : plane->crtc;
> intel_crtc = to_intel_crtc(crtc);
>
> - plane->fb = state->base.fb;
> - crtc->cursor_x = state->base.crtc_x;
> - crtc->cursor_y = state->base.crtc_y;
> -
> if (intel_crtc->cursor_bo == obj)
> goto update;
>
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index ca7e26430e66..9553859ca151 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -927,8 +927,6 @@ intel_commit_sprite_plane(struct drm_plane *plane,
>
> crtc = crtc ? crtc : plane->crtc;
>
> - plane->fb = fb;
> -
> if (!crtc->state->active)
> return;
>
> --
> 2.1.0
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Daniel Vetter
Software Engineer, Intel Corporation