Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915: move the DRIVER_* macros to i915_driver.[ch]

The macros are more at home in i915_driver.[ch].

v2: Rebase

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209123121.3337496-1-jani.nikula@intel.com

+27 -22
+1
drivers/gpu/drm/i915/gem/i915_gem_pm.c
··· 10 10 #include "gt/intel_gt_pm.h" 11 11 #include "gt/intel_gt_requests.h" 12 12 13 + #include "i915_driver.h" 13 14 #include "i915_drv.h" 14 15 15 16 #if defined(CONFIG_X86)
+15
drivers/gpu/drm/i915/i915_driver.c
··· 1821 1821 DRM_IOCTL_DEF_DRV(I915_GEM_VM_DESTROY, i915_gem_vm_destroy_ioctl, DRM_RENDER_ALLOW), 1822 1822 }; 1823 1823 1824 + /* 1825 + * Interface history: 1826 + * 1827 + * 1.1: Original. 1828 + * 1.2: Add Power Management 1829 + * 1.3: Add vblank support 1830 + * 1.4: Fix cmdbuffer path, add heap destroy 1831 + * 1.5: Add vblank pipe configuration 1832 + * 1.6: - New ioctl for scheduling buffer swaps on vertical blank 1833 + * - Support vertical blank on secondary display pipe 1834 + */ 1835 + #define DRIVER_MAJOR 1 1836 + #define DRIVER_MINOR 6 1837 + #define DRIVER_PATCHLEVEL 0 1838 + 1824 1839 static const struct drm_driver i915_drm_driver = { 1825 1840 /* Don't use MTRRs here; the Xserver or userspace app should 1826 1841 * deal with them for Intel hardware.
+5
drivers/gpu/drm/i915/i915_driver.h
··· 12 12 struct pci_device_id; 13 13 struct drm_i915_private; 14 14 15 + #define DRIVER_NAME "i915" 16 + #define DRIVER_DESC "Intel Graphics" 17 + #define DRIVER_DATE "20201103" 18 + #define DRIVER_TIMESTAMP 1604406085 19 + 15 20 extern const struct dev_pm_ops i915_pm_ops; 16 21 17 22 int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
-22
drivers/gpu/drm/i915/i915_drv.h
··· 131 131 struct intel_overlay_error_state; 132 132 struct vlv_s0ix_state; 133 133 134 - /* General customization: 135 - */ 136 - 137 - #define DRIVER_NAME "i915" 138 - #define DRIVER_DESC "Intel Graphics" 139 - #define DRIVER_DATE "20201103" 140 - #define DRIVER_TIMESTAMP 1604406085 141 - 142 134 /* Threshold == 5 for long IRQs, 50 for short */ 143 135 #define HPD_STORM_DEFAULT_THRESHOLD 50 144 136 ··· 271 279 atomic_t ban_score; 272 280 unsigned long hang_timestamp; 273 281 }; 274 - 275 - /* Interface history: 276 - * 277 - * 1.1: Original. 278 - * 1.2: Add Power Management 279 - * 1.3: Add vblank support 280 - * 1.4: Fix cmdbuffer path, add heap destroy 281 - * 1.5: Add vblank pipe configuration 282 - * 1.6: - New ioctl for scheduling buffer swaps on vertical blank 283 - * - Support vertical blank on secondary display pipe 284 - */ 285 - #define DRIVER_MAJOR 1 286 - #define DRIVER_MINOR 6 287 - #define DRIVER_PATCHLEVEL 0 288 282 289 283 struct sdvo_device_mapping { 290 284 u8 initialized;
+1
drivers/gpu/drm/i915/i915_gpu_error.c
··· 46 46 #include "gt/intel_gt_pm.h" 47 47 #include "gt/intel_gt_regs.h" 48 48 49 + #include "i915_driver.h" 49 50 #include "i915_drv.h" 50 51 #include "i915_gpu_error.h" 51 52 #include "i915_memcpy.h"
+1
drivers/gpu/drm/i915/i915_irq.c
··· 49 49 #include "gt/intel_gt_regs.h" 50 50 #include "gt/intel_rps.h" 51 51 52 + #include "i915_driver.h" 52 53 #include "i915_drv.h" 53 54 #include "i915_irq.h" 54 55 #include "intel_pm.h"
+1
drivers/gpu/drm/i915/i915_mitigations.c
··· 8 8 #include <linux/slab.h> 9 9 #include <linux/string.h> 10 10 11 + #include "i915_driver.h" 11 12 #include "i915_drv.h" 12 13 #include "i915_mitigations.h" 13 14
+1
drivers/gpu/drm/i915/i915_module.c
··· 10 10 #include "gem/i915_gem_object.h" 11 11 #include "i915_active.h" 12 12 #include "i915_buddy.h" 13 + #include "i915_driver.h" 13 14 #include "i915_params.h" 14 15 #include "i915_pci.h" 15 16 #include "i915_perf.h"
+1
drivers/gpu/drm/i915/i915_request.c
··· 44 44 45 45 #include "i915_active.h" 46 46 #include "i915_deps.h" 47 + #include "i915_driver.h" 47 48 #include "i915_drv.h" 48 49 #include "i915_trace.h" 49 50 #include "intel_pm.h"
+1
drivers/gpu/drm/i915/selftests/i915_selftest.c
··· 24 24 #include <linux/random.h> 25 25 26 26 #include "gt/intel_gt_pm.h" 27 + #include "i915_driver.h" 27 28 #include "i915_drv.h" 28 29 #include "i915_selftest.h" 29 30