[Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed

[Jani Nikula]

On Thu, 17 Mar 2022, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
>> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
>> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
>> drm/i915_drm.h only where needed.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> Looks sensible to me. Series is 
> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

Thanks for the review, pushed to drm-intel-next, with Bjorn's ack.

BR,
Jani.

>
>> ---
>>  drivers/gpu/drm/i915/gem/i915_gem_lmem.c     | 2 ++
>>  drivers/gpu/drm/i915/gem/i915_gem_region.c   | 2 ++
>>  drivers/gpu/drm/i915/intel_memory_region.c   | 2 ++
>>  drivers/gpu/drm/i915/intel_memory_region.h   | 2 +-
>>  drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
>>  include/drm/i915_drm.h                       | 2 +-
>>  6 files changed, 8 insertions(+), 4 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> index 444f8268b9c5..ede084f36ca9 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> @@ -3,6 +3,8 @@
>>   * Copyright © 2019 Intel Corporation
>>   */
>>  
>> +#include <uapi/drm/i915_drm.h>
>> +
>>  #include "intel_memory_region.h"
>>  #include "gem/i915_gem_region.h"
>>  #include "gem/i915_gem_lmem.h"
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> index c9b2e8b91053..f4fbae2f9dcc 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> @@ -3,6 +3,8 @@
>>   * Copyright © 2019 Intel Corporation
>>   */
>>  
>> +#include <uapi/drm/i915_drm.h>
>> +
>>  #include "intel_memory_region.h"
>>  #include "i915_gem_region.h"
>>  #include "i915_drv.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
>> index 1c841f68169a..ded78b83e0b5 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.c
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
>> @@ -5,6 +5,8 @@
>>  
>>  #include <linux/prandom.h>
>>  
>> +#include <uapi/drm/i915_drm.h>
>> +
>>  #include "intel_memory_region.h"
>>  #include "i915_drv.h"
>>  #include "i915_ttm_buddy_manager.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
>> index 21dcbd620758..bbc35ec5c090 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.h
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
>> @@ -10,7 +10,7 @@
>>  #include <linux/mutex.h>
>>  #include <linux/io-mapping.h>
>>  #include <drm/drm_mm.h>
>> -#include <drm/i915_drm.h>
>> +#include <uapi/drm/i915_drm.h>
>>  
>>  struct drm_i915_private;
>>  struct drm_i915_gem_object;
>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> index 598840b73dfa..92b00b4de240 100644
>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> @@ -3,8 +3,6 @@
>>   * Copyright(c) 2020, Intel Corporation. All rights reserved.
>>   */
>>  
>> -#include <drm/i915_drm.h>
>> -
>>  #include "i915_drv.h"
>>  
>>  #include "intel_pxp.h"
>> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
>> index afbf3ef5643e..7adce327c1c2 100644
>> --- a/include/drm/i915_drm.h
>> +++ b/include/drm/i915_drm.h
>> @@ -26,7 +26,7 @@
>>  #ifndef _I915_DRM_H_
>>  #define _I915_DRM_H_
>>  
>> -#include <uapi/drm/i915_drm.h>
>> +#include <linux/types.h>
>>  
>>  /* For use by IPS driver */
>>  unsigned long i915_read_mch_val(void);
>> -- 
>> 2.30.2

-- 
Jani Nikula, Intel Open Source Graphics Center