[Intel-xe] [PATCH 1/6] Revert "FIXME: drm/i915: include intel_frontbuffer.h from skl_universal_plane.c"

Hogander, Jouni jouni.hogander at intel.com
Tue Sep 19 05:39:20 UTC 2023


On Mon, 2023-09-18 at 20:54 +0000, Govindapillai, Vinod wrote:
> On Fri, 2023-09-15 at 13:57 +0300, Jouni Högander wrote:
> > This reverts commit c3e942a06433e8c538108f24b4fe78a0927e2aea.
> > 
> > We are about to backport upstream changes that is taking care of
> > including
> > intel_frontbuffer.h as necessary.
> > 
> > Signed-off-by: Jouni Högander <jouni.hogander at intel.com>
> > ---
> 
> Hi Jouni,
> 
> Should these reverts be moved after the patch 4 in this series? Won't
> that cause build failure? Or
> the patch description is not accurate?

I choose this approach as backporting patch 4 would have lots of
conflicts if backporting it first. On next rebase all these patches
will disappear anyways.

BR,

Jouni Högander
 
> 
> With that checked, 
> 
> Reviewed-by: Vinod Govindapillai <vinod.govindapillai at intel.com>
> 
> >  drivers/gpu/drm/i915/display/skl_universal_plane.c | 1 -
> >  1 file changed, 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > index 4d01c7ae4485..2ded1bcce754 100644
> > --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> > @@ -16,7 +16,6 @@
> >  #include "intel_display_types.h"
> >  #include "intel_fb.h"
> >  #include "intel_fbc.h"
> > -#include "intel_frontbuffer.h"
> >  #include "intel_psr.h"
> >  #include "skl_scaler.h"
> >  #include "skl_universal_plane.h"
> 



More information about the Intel-xe mailing list