Re: [Intel-gfx] [PATCH] drm/i915: move the DRIVER_* macros to i915_driver.[ch]

[Jani Nikula <jani.nikula@intel.com>]

On Wed, 09 Feb 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Thu, Feb 03, 2022 at 04:39:24PM +0200, Jani Nikula wrote:
>> The macros are more at home in i915_driver.[ch].
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  drivers/gpu/drm/i915/gem/i915_gem_pm.c        |  1 +
>>  drivers/gpu/drm/i915/i915_driver.c            | 15 ++++++++++++
>>  drivers/gpu/drm/i915/i915_driver.h            |  5 ++++
>>  drivers/gpu/drm/i915/i915_drv.h               | 23 -------------------
>>  drivers/gpu/drm/i915/i915_gpu_error.c         |  1 +
>>  drivers/gpu/drm/i915/i915_irq.c               |  1 +
>>  drivers/gpu/drm/i915/i915_mitigations.c       |  1 +
>>  drivers/gpu/drm/i915/i915_module.c            |  1 +
>>  drivers/gpu/drm/i915/i915_request.c           |  1 +
>>  .../gpu/drm/i915/selftests/i915_selftest.c    |  1 +
>
> A bit surprising these things are so widespread.

Indeed!

> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Thanks, sent rebased v2 due to conflicts while applying.

BR,
Jani.


>
>>  10 files changed, 27 insertions(+), 23 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
>> index 6da68b38f00f..00359ec9d58b 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
>> @@ -10,6 +10,7 @@
>>  #include "gt/intel_gt_pm.h"
>>  #include "gt/intel_gt_requests.h"
>>  
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  
>>  #if defined(CONFIG_X86)
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 3d41f532a5d6..76c84b35884f 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1823,6 +1823,21 @@ static const struct drm_ioctl_desc i915_ioctls[] = {
>>  	DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW),
>>  };
>>  
>> +/*
>> + * Interface history:
>> + *
>> + * 1.1: Original.
>> + * 1.2: Add Power Management
>> + * 1.3: Add vblank support
>> + * 1.4: Fix cmdbuffer path, add heap destroy
>> + * 1.5: Add vblank pipe configuration
>> + * 1.6: - New ioctl for scheduling buffer swaps on vertical blank
>> + *      - Support vertical blank on secondary display pipe
>> + */
>> +#define DRIVER_MAJOR		1
>> +#define DRIVER_MINOR		6
>> +#define DRIVER_PATCHLEVEL	0
>> +
>>  static const struct drm_driver i915_drm_driver = {
>>  	/* Don't use MTRRs here; the Xserver or userspace app should
>>  	 * deal with them for Intel hardware.
>> diff --git a/drivers/gpu/drm/i915/i915_driver.h b/drivers/gpu/drm/i915/i915_driver.h
>> index 9ef8db4aa0a6..9d11de65daaf 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.h
>> +++ b/drivers/gpu/drm/i915/i915_driver.h
>> @@ -12,6 +12,11 @@ struct pci_dev;
>>  struct pci_device_id;
>>  struct drm_i915_private;
>>  
>> +#define DRIVER_NAME		"i915"
>> +#define DRIVER_DESC		"Intel Graphics"
>> +#define DRIVER_DATE		"20201103"
>> +#define DRIVER_TIMESTAMP	1604406085
>> +
>>  extern const struct dev_pm_ops i915_pm_ops;
>>  
>>  int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
>> index 8c1706fd81f9..bd444e16ce5e 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -106,15 +106,6 @@
>>  #include "gt/intel_timeline.h"
>>  #include "i915_vma.h"
>>  
>> -
>> -/* General customization:
>> - */
>> -
>> -#define DRIVER_NAME		"i915"
>> -#define DRIVER_DESC		"Intel Graphics"
>> -#define DRIVER_DATE		"20201103"
>> -#define DRIVER_TIMESTAMP	1604406085
>> -
>>  struct drm_i915_gem_object;
>>  
>>  /* Threshold == 5 for long IRQs, 50 for short */
>> @@ -260,20 +251,6 @@ struct drm_i915_file_private {
>>  	unsigned long hang_timestamp;
>>  };
>>  
>> -/* Interface history:
>> - *
>> - * 1.1: Original.
>> - * 1.2: Add Power Management
>> - * 1.3: Add vblank support
>> - * 1.4: Fix cmdbuffer path, add heap destroy
>> - * 1.5: Add vblank pipe configuration
>> - * 1.6: - New ioctl for scheduling buffer swaps on vertical blank
>> - *      - Support vertical blank on secondary display pipe
>> - */
>> -#define DRIVER_MAJOR		1
>> -#define DRIVER_MINOR		6
>> -#define DRIVER_PATCHLEVEL	0
>> -
>>  struct intel_overlay;
>>  struct intel_overlay_error_state;
>>  
>> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
>> index 127ff56c8ce6..54b2360dfd99 100644
>> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
>> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
>> @@ -46,6 +46,7 @@
>>  #include "gt/intel_gt_pm.h"
>>  #include "gt/intel_gt_regs.h"
>>  
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  #include "i915_gpu_error.h"
>>  #include "i915_memcpy.h"
>> diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
>> index c05eb09d8a66..78871518c67b 100644
>> --- a/drivers/gpu/drm/i915/i915_irq.c
>> +++ b/drivers/gpu/drm/i915/i915_irq.c
>> @@ -49,6 +49,7 @@
>>  #include "gt/intel_gt_regs.h"
>>  #include "gt/intel_rps.h"
>>  
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  #include "i915_irq.h"
>>  #include "intel_pm.h"
>> diff --git a/drivers/gpu/drm/i915/i915_mitigations.c b/drivers/gpu/drm/i915/i915_mitigations.c
>> index 84f12598d145..def7302ef7fe 100644
>> --- a/drivers/gpu/drm/i915/i915_mitigations.c
>> +++ b/drivers/gpu/drm/i915/i915_mitigations.c
>> @@ -8,6 +8,7 @@
>>  #include <linux/slab.h>
>>  #include <linux/string.h>
>>  
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  #include "i915_mitigations.h"
>>  
>> diff --git a/drivers/gpu/drm/i915/i915_module.c b/drivers/gpu/drm/i915/i915_module.c
>> index 4d324638aba5..65acd7bf75d0 100644
>> --- a/drivers/gpu/drm/i915/i915_module.c
>> +++ b/drivers/gpu/drm/i915/i915_module.c
>> @@ -9,6 +9,7 @@
>>  #include "gem/i915_gem_context.h"
>>  #include "gem/i915_gem_object.h"
>>  #include "i915_active.h"
>> +#include "i915_driver.h"
>>  #include "i915_params.h"
>>  #include "i915_pci.h"
>>  #include "i915_perf.h"
>> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c
>> index 55beedb2ced1..582770360ad1 100644
>> --- a/drivers/gpu/drm/i915/i915_request.c
>> +++ b/drivers/gpu/drm/i915/i915_request.c
>> @@ -44,6 +44,7 @@
>>  
>>  #include "i915_active.h"
>>  #include "i915_deps.h"
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  #include "i915_trace.h"
>>  #include "intel_pm.h"
>> diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c
>> index 2d6d7bd13c3c..c4e932368b37 100644
>> --- a/drivers/gpu/drm/i915/selftests/i915_selftest.c
>> +++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c
>> @@ -24,6 +24,7 @@
>>  #include <linux/random.h>
>>  
>>  #include "gt/intel_gt_pm.h"
>> +#include "i915_driver.h"
>>  #include "i915_drv.h"
>>  #include "i915_selftest.h"
>>  
>> -- 
>> 2.30.2

-- 
Jani Nikula, Intel Open Source Graphics Center