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
This commit is contained in:
parent
df62ae6fc9
commit
24524e3f43
@ -10,6 +10,7 @@
|
|||||||
#include "gt/intel_gt_pm.h"
|
#include "gt/intel_gt_pm.h"
|
||||||
#include "gt/intel_gt_requests.h"
|
#include "gt/intel_gt_requests.h"
|
||||||
|
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
|
|
||||||
#if defined(CONFIG_X86)
|
#if defined(CONFIG_X86)
|
||||||
|
@ -1821,6 +1821,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),
|
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 = {
|
static const struct drm_driver i915_drm_driver = {
|
||||||
/* Don't use MTRRs here; the Xserver or userspace app should
|
/* Don't use MTRRs here; the Xserver or userspace app should
|
||||||
* deal with them for Intel hardware.
|
* deal with them for Intel hardware.
|
||||||
|
@ -12,6 +12,11 @@ struct pci_dev;
|
|||||||
struct pci_device_id;
|
struct pci_device_id;
|
||||||
struct drm_i915_private;
|
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;
|
extern const struct dev_pm_ops i915_pm_ops;
|
||||||
|
|
||||||
int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
|
int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||||
|
@ -131,14 +131,6 @@ struct intel_overlay;
|
|||||||
struct intel_overlay_error_state;
|
struct intel_overlay_error_state;
|
||||||
struct vlv_s0ix_state;
|
struct vlv_s0ix_state;
|
||||||
|
|
||||||
/* General customization:
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define DRIVER_NAME "i915"
|
|
||||||
#define DRIVER_DESC "Intel Graphics"
|
|
||||||
#define DRIVER_DATE "20201103"
|
|
||||||
#define DRIVER_TIMESTAMP 1604406085
|
|
||||||
|
|
||||||
/* Threshold == 5 for long IRQs, 50 for short */
|
/* Threshold == 5 for long IRQs, 50 for short */
|
||||||
#define HPD_STORM_DEFAULT_THRESHOLD 50
|
#define HPD_STORM_DEFAULT_THRESHOLD 50
|
||||||
|
|
||||||
@ -280,20 +272,6 @@ struct drm_i915_file_private {
|
|||||||
unsigned long hang_timestamp;
|
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 sdvo_device_mapping {
|
struct sdvo_device_mapping {
|
||||||
u8 initialized;
|
u8 initialized;
|
||||||
u8 dvo_port;
|
u8 dvo_port;
|
||||||
|
@ -46,6 +46,7 @@
|
|||||||
#include "gt/intel_gt_pm.h"
|
#include "gt/intel_gt_pm.h"
|
||||||
#include "gt/intel_gt_regs.h"
|
#include "gt/intel_gt_regs.h"
|
||||||
|
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_gpu_error.h"
|
#include "i915_gpu_error.h"
|
||||||
#include "i915_memcpy.h"
|
#include "i915_memcpy.h"
|
||||||
|
@ -49,6 +49,7 @@
|
|||||||
#include "gt/intel_gt_regs.h"
|
#include "gt/intel_gt_regs.h"
|
||||||
#include "gt/intel_rps.h"
|
#include "gt/intel_rps.h"
|
||||||
|
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_irq.h"
|
#include "i915_irq.h"
|
||||||
#include "intel_pm.h"
|
#include "intel_pm.h"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/string.h>
|
#include <linux/string.h>
|
||||||
|
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_mitigations.h"
|
#include "i915_mitigations.h"
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@
|
|||||||
#include "gem/i915_gem_object.h"
|
#include "gem/i915_gem_object.h"
|
||||||
#include "i915_active.h"
|
#include "i915_active.h"
|
||||||
#include "i915_buddy.h"
|
#include "i915_buddy.h"
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_params.h"
|
#include "i915_params.h"
|
||||||
#include "i915_pci.h"
|
#include "i915_pci.h"
|
||||||
#include "i915_perf.h"
|
#include "i915_perf.h"
|
||||||
|
@ -44,6 +44,7 @@
|
|||||||
|
|
||||||
#include "i915_active.h"
|
#include "i915_active.h"
|
||||||
#include "i915_deps.h"
|
#include "i915_deps.h"
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_trace.h"
|
#include "i915_trace.h"
|
||||||
#include "intel_pm.h"
|
#include "intel_pm.h"
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
#include <linux/random.h>
|
#include <linux/random.h>
|
||||||
|
|
||||||
#include "gt/intel_gt_pm.h"
|
#include "gt/intel_gt_pm.h"
|
||||||
|
#include "i915_driver.h"
|
||||||
#include "i915_drv.h"
|
#include "i915_drv.h"
|
||||||
#include "i915_selftest.h"
|
#include "i915_selftest.h"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user