[PATCH 01/10] drm/i915/display: include gem/i915_gem_stolen.h where needed

[Rodrigo Vivi]

On Tue, Jun 04, 2024 at 02:41:11PM +0300, Jani Nikula wrote:
> On Fri, 31 May 2024, Jani Nikula <jani.nikula at intel.com> wrote:
> > On Fri, 31 May 2024, Rodrigo Vivi <rodrigo.vivi at intel.com> wrote:
> >> On Wed, May 29, 2024 at 08:48:05PM +0300, Jani Nikula wrote:
> >>> Include what you use. We need to move the compat i915_gem_stolen.h under
> >>> gem subdir.
> >>
> >> The patch below looks fine, but this message here is strange.
> >> It looks like this patch is moving the header file from a top dir to
> >> under 'gem' dir. But the header is already there.
> >
> > Huh, in compat-i915-headers it's not? And that's the point, the
> > hierarchy should match i915 but for a couple of files it doesn't.
> 
> Rodrigo, any follow-up here? Am I missing something?

Sorry for not getting back sooner on this. I had missunderstood
your latest response.

As well as I had missunderstood the commit...
you are indeed moving the files with git mv. it is just that git is smartly showing
that and I'm poorly reading that...
(doh! & facepalm)


Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
(for the series)

> 
> BR,
> Jani.
> 
> 
> >
> > BR,
> > Jani.
> >
> >
> >>
> >>> With this, we can drop the include from xe compat
> >>> i915_drv.h.
> >>> 
> >>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> >>> ---
> >>>  drivers/gpu/drm/i915/display/intel_fbc.c                         | 1 +
> >>>  .../gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h   | 0
> >>>  drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h                | 1 -
> >>>  3 files changed, 1 insertion(+), 1 deletion(-)
> >>>  rename drivers/gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h (100%)
> >>> 
> >>> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c b/drivers/gpu/drm/i915/display/intel_fbc.c
> >>> index e9189a864f69..6985abeb6102 100644
> >>> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> >>> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> >>> @@ -43,6 +43,7 @@
> >>>  #include <drm/drm_blend.h>
> >>>  #include <drm/drm_fourcc.h>
> >>>  
> >>> +#include "gem/i915_gem_stolen.h"
> >>>  #include "i915_drv.h"
> >>>  #include "i915_reg.h"
> >>>  #include "i915_utils.h"
> >>> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h b/drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
> >>> similarity index 100%
> >>> rename from drivers/gpu/drm/xe/compat-i915-headers/i915_gem_stolen.h
> >>> rename to drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_stolen.h
> >>> diff --git a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> >>> index cd4632276141..3be3d419530a 100644
> >>> --- a/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> >>> +++ b/drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
> >>> @@ -19,7 +19,6 @@
> >>>  #include "xe_bo.h"
> >>>  #include "xe_pm.h"
> >>>  #include "xe_step.h"
> >>> -#include "i915_gem_stolen.h"
> >>>  #include "i915_gpu_error.h"
> >>>  #include "i915_reg_defs.h"
> >>>  #include "i915_utils.h"
> >>> -- 
> >>> 2.39.2
> >>> 
> 
> -- 
> Jani Nikula, Intel