Re: [Intel-gfx] [PATCH] drm/i915: stop including i915_irq.h from i915_drv.h

Jani Nikula
2022-01-05T17:27:13Z

On Wed, 05 Jan 2022, Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com> wrote:
> On 05/01/2022 10:21, Jani Nikula wrote:
>> Only include i915_irq.h where actually needed.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Thanks, pushed to drm-intel-next.

BR,
Jani.

>
> Regards,
>
> Tvrtko
>
>> ---
>> drivers/gpu/drm/i915/display/intel_crtc.c | 1 +
>> drivers/gpu/drm/i915/display/intel_display_trace.h | 1 +
>> drivers/gpu/drm/i915/gt/intel_rps.c | 1 +
>> drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 +
>> drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 1 +
>> drivers/gpu/drm/i915/i915_drv.h | 1 -
>> 6 files changed, 5 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
>> index 16c3ca66d9f0..08ee3e17ee5c 100644
>> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
>> @@ -12,6 +12,7 @@
>> #include <drm/drm_plane_helper.h>
>> #include <drm/drm_vblank_work.h>
>>
>> +#include "i915_irq.h"
>> #include "i915_vgpu.h"
>> #include "i9xx_plane.h"
>> #include "icl_dsi.h"
>> diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h
>> index 4043e1276383..f05f0f9b5103 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_trace.h
>> +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h
>> @@ -13,6 +13,7 @@
>> #include <linux/tracepoint.h>
>>
>> #include "i915_drv.h"
>> +#include "i915_irq.h"
>> #include "intel_crtc.h"
>> #include "intel_display_types.h"
>>
>> diff --git a/drivers/gpu/drm/i915/gt/intel_rps.c b/drivers/gpu/drm/i915/gt/intel_rps.c
>> index 54e7df788dbf..bd35e45d3aaa 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_rps.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_rps.c
>> @@ -6,6 +6,7 @@
>> #include <drm/i915_drm.h>
>>
>> #include "i915_drv.h"
>> +#include "i915_irq.h"
>> #include "intel_breadcrumbs.h"
>> #include "intel_gt.h"
>> #include "intel_gt_clock_utils.h"
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
>> index 6e228343e8cb..0c52d1652e8b 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
>> @@ -12,6 +12,7 @@
>> #include "intel_guc_ads.h"
>> #include "intel_guc_submission.h"
>> #include "i915_drv.h"
>> +#include "i915_irq.h"
>>
>> /**
>> * DOC: GuC
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
>> index ac0931f0374b..7b0b43e87244 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_log.c
>> @@ -7,6 +7,7 @@
>>
>> #include "gt/intel_gt.h"
>> #include "i915_drv.h"
>> +#include "i915_irq.h"
>> #include "i915_memcpy.h"
>> #include "intel_guc_log.h"
>>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index beeb42a14aae..3967748ba347 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -106,7 +106,6 @@
>> #include "i915_scheduler.h"
>> #include "gt/intel_timeline.h"
>> #include "i915_vma.h"
>> -#include "i915_irq.h"
>>
>>
>> /* General customization:
>>

--
Jani Nikula, Intel Open Source Graphics Center