[Intel-gfx] [PATCH 1/2] drm/i915: Explicitly cleanup initial_plane_config

[Chris Wilson]

Quoting Ville Syrjälä (2019-11-12 15:20:52)
> On Tue, Nov 12, 2019 at 02:36:42PM +0000, Chris Wilson wrote:
> > @@ -3317,7 +3313,6 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
> >       if (plane_config->tiling)
> >               dev_priv->preserve_bios_swizzle = true;
> >  
> > -     plane_state->fb = fb;
> 
> This stuff looks wrong. We still want the plane state to point at the
> fb.

Oh, it used to be

@@ -3266,8 +3262,9 @@ intel_find_initial_plane_obj(struct intel_crtc *intel_crtc,
        if (plane_config->tiling)
                dev_priv->preserve_bios_swizzle = true;

-       plane_state->fb = fb;
        plane_state->crtc = &intel_crtc->base;
+       plane_state->fb = fb;
+       drm_framebuffer_get(fb);

        atomic_or(to_intel_plane(primary)->frontbuffer_bit,
                  &to_intel_frontbuffer(fb)->bits);

I'll blame it on not paying enough attention during the rebase.
-Chris