[Intel-gfx] [PATCH 06/11] drm/i915: migrate skl planes code new file (v3)

[Dave Airlie]

On Fri, 15 Jan 2021 at 01:57, Ville Syrjälä
<ville.syrjala at linux.intel.com> wrote:
>
> On Thu, Jan 14, 2021 at 01:13:50PM +0200, Jani Nikula wrote:
> > From: Dave Airlie <airlied at redhat.com>
> >
> > Rework the plane init calls to do the gen test one level higher.
> >
> > Rework some of the plane helpers so they can live in new file,
> > there is still some scope to clean up the plane/fb interactions
> > later.
> >
> > v2: drop atomic code back, rename file to Ville suggestions,
> > add header file.
> > v3: move scaler bits back
> >
> > Signed-off-by: Dave Airlie <airlied at redhat.com>
> > [Jani: fixed up sparse warnings.]
> > Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> > Reported-by: kernel test robot <lkp at intel.com>
> > Reported-by: Dan Carpenter <dan.carpenter at oracle.com>
> > ---
> <snip>
> > -unsigned int
> > -intel_plane_fence_y_offset(const struct intel_plane_state *plane_state)
> > -{
> > -     int x = 0, y = 0;
> > -
> > -     intel_plane_adjust_aligned_offset(&x, &y, plane_state, 0,
> > -                                       plane_state->color_plane[0].offset, 0);
> > -
> > -     return y;
> > -}
>
> This getting moved around is messing up the diff.
>
> <snip>
> > @@ -4386,15 +3633,6 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
> >       return 0;
> >  }
> >
> > -void skl_scaler_disable(const struct intel_crtc_state *old_crtc_state)
> > -{
> > -     struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
> > -     int i;
> > -
> > -     for (i = 0; i < crtc->num_scalers; i++)
> > -             skl_detach_scaler(crtc, i);
> > -}
>
> Same here.

Wierd not sure how to generate it better.
>
> <snip>
> > diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > index f76e2c2a83b8..8e4b6647752f 100644
> > --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> > @@ -39,6 +39,7 @@
> >  #include "intel_dp_mst.h"
> >  #include "intel_dpio_phy.h"
> >  #include "intel_hdcp.h"
> > +#include "skl_universal_plane.h"
>
> Why is this here?

Not sure, probably left over from moving scaler, dropped it now.

>
> >
> >  static int intel_dp_mst_compute_link_config(struct intel_encoder *encoder,
> >                                           struct intel_crtc_state *crtc_state,
> > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> > index c24ae69426cf..0d0b0d3c52a1 100644
> > --- a/drivers/gpu/drm/i915/display/intel_psr.c
> > +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> > @@ -31,6 +31,7 @@
> >  #include "intel_psr.h"
> >  #include "intel_sprite.h"
> >  #include "intel_hdmi.h"
> > +#include "skl_universal_plane.h"
>
> Is this due to the psr damage stuff?

intel_psr2_program_plane_sel_fetch calls skl_calc_main_surface_offset
>
> <snip>
> > diff --git a/drivers/gpu/drm/i915/display/vlv_dsi.c b/drivers/gpu/drm/i915/display/vlv_dsi.c
> > index f94025ec603a..ebf266457518 100644
> > --- a/drivers/gpu/drm/i915/display/vlv_dsi.c
> > +++ b/drivers/gpu/drm/i915/display/vlv_dsi.c
> > @@ -38,6 +38,7 @@
> >  #include "intel_fifo_underrun.h"
> >  #include "intel_panel.h"
> >  #include "intel_sideband.h"
> > +#include "skl_universal_plane.h"
>
> Why do we need this here?
>
Oops as well, dropped it.

Dave.