Commit 24524e3f authored by Jani Nikula's avatar Jani Nikula
Browse files

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



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

v2: Rebase

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

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/i915/i915_driver.c

+15 −0
Original line number Diff line number Diff line
@@ -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),

};



/*

 * 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.

drivers/gpu/drm/i915/i915_driver.h

+5 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/i915/i915_drv.h

+0 −22
Original line number Diff line number Diff line
@@ -131,14 +131,6 @@ struct intel_overlay; 
struct intel_overlay_error_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 */

#define HPD_STORM_DEFAULT_THRESHOLD 50
@@ -280,20 +272,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 sdvo_device_mapping {

	u8 initialized;

	u8 dvo_port;

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −0
Original line number Diff line number Diff line
@@ -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"