[Intel-gfx] [PATCH v2 05/13] drm/i915: Stop updating plane->fb/crtc

[Daniel Vetter]

On Thu, Apr 5, 2018 at 7:02 PM, Ville Syrjala
<ville.syrjala at linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> We want to get rid of plane->fb/crtc on atomic drivers. Stop setting
> them.
>
> v2: Fix up the comment in intel_crtc_active() and
>     nuke the rest of the stale comments (Daniel)
>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com> #v1
> Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

lgtm, ack on adding my r-b.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_atomic_plane.c | 12 ------------
>  drivers/gpu/drm/i915/intel_display.c      |  7 +++----
>  2 files changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_atomic_plane.c b/drivers/gpu/drm/i915/intel_atomic_plane.c
> index 7481ce85746b..eb0579fb5e54 100644
> --- a/drivers/gpu/drm/i915/intel_atomic_plane.c
> +++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
> @@ -120,12 +120,6 @@ int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_
>                 &crtc_state->base.adjusted_mode;
>         int ret;
>
> -       /*
> -        * Both crtc and plane->crtc could be NULL if we're updating a
> -        * property while the plane is disabled.  We don't actually have
> -        * anything driver-specific we need to test in that case, so
> -        * just return success.
> -        */
>         if (!intel_state->base.crtc && !old_plane_state->base.crtc)
>                 return 0;
>
> @@ -204,12 +198,6 @@ static int intel_plane_atomic_check(struct drm_plane *plane,
>         const struct drm_crtc_state *old_crtc_state;
>         struct drm_crtc_state *new_crtc_state;
>
> -       /*
> -        * Both crtc and plane->crtc could be NULL if we're updating a
> -        * property while the plane is disabled.  We don't actually have
> -        * anything driver-specific we need to test in that case, so
> -        * just return success.
> -        */
>         if (!crtc)
>                 return 0;
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 415fb8cf2cf4..469792fa098d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -979,7 +979,7 @@ bool intel_crtc_active(struct intel_crtc *crtc)
>          * We can ditch the adjusted_mode.crtc_clock check as soon
>          * as Haswell has gained clock readout/fastboot support.
>          *
> -        * We can ditch the crtc->primary->fb check as soon as we can
> +        * We can ditch the crtc->primary->state->fb check as soon as we can
>          * properly reconstruct framebuffers.
>          *
>          * FIXME: The intel_crtc->active here should be switched to
> @@ -2877,9 +2877,8 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
>         if (i915_gem_object_is_tiled(obj))
>                 dev_priv->preserve_bios_swizzle = true;
>
> -       drm_framebuffer_get(fb);
> -       primary->fb = primary->state->fb = fb;
> -       primary->crtc = primary->state->crtc = &intel_crtc->base;
> +       plane_state->fb = fb;
> +       plane_state->crtc = &intel_crtc->base;
>
>         intel_set_plane_visible(to_intel_crtc_state(crtc_state),
>                                 to_intel_plane_state(plane_state),
> --
> 2.16.1
>



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch