Re: [Intel-xe] [PATCH 08/22] drm/xe: Fix build for CONFIG_DRM_XE_DEBUG

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Mon, Feb 13, 2023 at 03:22:47PM -0800, Matt Roper wrote:
> On Fri, Feb 03, 2023 at 03:23:55PM -0500, Rodrigo Vivi wrote:
> > From: Matthew Brost <matthew.brost@intel.com>
> > 
> > GT TLB invalidation functions are now in header
> > xe_gt_tlb_invalidation.h, include that file in xe_gt_debugfs.c if
> > CONFIG_DRM_XE_DEBUG is set.
> > 
> > Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> 
> Should this be squashed into patch #2?

It would be better indeed.., I'm trying to avoid the changes
in these merged patches right now. But I will keep in mind
for the next rebase on upstream.

Thanks,
Rodrigo.

> 
> 
> Matt
> 
> > ---
> >  drivers/gpu/drm/xe/xe_gt_debugfs.c | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > index 30058c6100ab..946398f08bb5 100644
> > --- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > +++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
> > @@ -11,12 +11,15 @@
> >  #include "xe_gt.h"
> >  #include "xe_gt_debugfs.h"
> >  #include "xe_gt_mcr.h"
> > -#include "xe_gt_pagefault.h"
> >  #include "xe_gt_topology.h"
> >  #include "xe_hw_engine.h"
> >  #include "xe_macros.h"
> >  #include "xe_uc_debugfs.h"
> >  
> > +#ifdef CONFIG_DRM_XE_DEBUG
> > +#include "xe_gt_tlb_invalidation.h"
> > +#endif
> > +
> >  static struct xe_gt *node_to_gt(struct drm_info_node *node)
> >  {
> >  	return node->info_ent->data;
> > -- 
> > 2.39.1
> > 
> 
> -- 
> Matt Roper
> Graphics Software Engineer
> Linux GPU Platform Enablement
> Intel Corporation