Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffbab09b authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Dave Airlie
Browse files

drm: Remove pci_vendor and pci_device from struct drm_device 



We can get the PCI vendor and device IDs via dev->pdev. So we can drop
the duplicated information.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent fc6ff193

drivers/gpu/drm/drm_pci.c

+0 −3
Original line number Diff line number Diff line
@@ -331,9 +331,6 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent, 
		goto err_free;



	dev->pdev = pdev;

	dev->pci_device = pdev->device;

	dev->pci_vendor = pdev->vendor;



#ifdef __alpha__

	dev->hose = pdev->sysdata;

#endif

drivers/gpu/drm/gma500/psb_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ enum { 
	CHIP_MFLD_0130 = 3,		/* Medfield */

};



#define IS_PSB(dev) (((dev)->pci_device & 0xfffe) == 0x8108)

#define IS_MRST(dev) (((dev)->pci_device & 0xfffc) == 0x4100)

#define IS_MFLD(dev) (((dev)->pci_device & 0xfff8) == 0x0130)

#define IS_CDV(dev) (((dev)->pci_device & 0xfff0) == 0x0be0)

#define IS_PSB(dev) (((dev)->pdev->device & 0xfffe) == 0x8108)

#define IS_MRST(dev) (((dev)->pdev->device & 0xfffc) == 0x4100)

#define IS_MFLD(dev) (((dev)->pdev->device & 0xfff8) == 0x0130)

#define IS_CDV(dev) (((dev)->pdev->device & 0xfff0) == 0x0be0)



/*

 * Driver definitions

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -931,7 +931,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = READ_BREADCRUMB(dev_priv);

		break;

	case I915_PARAM_CHIPSET_ID:

		value = dev->pci_device;

		value = dev->pdev->device;

		break;

	case I915_PARAM_HAS_GEM:

		value = 1;

drivers/gpu/drm/i915/i915_drv.h

+18 −18
Original line number Diff line number Diff line
@@ -1590,39 +1590,39 @@ struct drm_i915_file_private { 


#define INTEL_INFO(dev)	(to_i915(dev)->info)



#define IS_I830(dev)		((dev)->pci_device == 0x3577)

#define IS_845G(dev)		((dev)->pci_device == 0x2562)

#define IS_I830(dev)		((dev)->pdev->device == 0x3577)

#define IS_845G(dev)		((dev)->pdev->device == 0x2562)

#define IS_I85X(dev)		(INTEL_INFO(dev)->is_i85x)

#define IS_I865G(dev)		((dev)->pci_device == 0x2572)

#define IS_I865G(dev)		((dev)->pdev->device == 0x2572)

#define IS_I915G(dev)		(INTEL_INFO(dev)->is_i915g)

#define IS_I915GM(dev)		((dev)->pci_device == 0x2592)

#define IS_I945G(dev)		((dev)->pci_device == 0x2772)

#define IS_I915GM(dev)		((dev)->pdev->device == 0x2592)

#define IS_I945G(dev)		((dev)->pdev->device == 0x2772)

#define IS_I945GM(dev)		(INTEL_INFO(dev)->is_i945gm)

#define IS_BROADWATER(dev)	(INTEL_INFO(dev)->is_broadwater)

#define IS_CRESTLINE(dev)	(INTEL_INFO(dev)->is_crestline)

#define IS_GM45(dev)		((dev)->pci_device == 0x2A42)

#define IS_GM45(dev)		((dev)->pdev->device == 0x2A42)

#define IS_G4X(dev)		(INTEL_INFO(dev)->is_g4x)

#define IS_PINEVIEW_G(dev)	((dev)->pci_device == 0xa001)

#define IS_PINEVIEW_M(dev)	((dev)->pci_device == 0xa011)

#define IS_PINEVIEW_G(dev)	((dev)->pdev->device == 0xa001)

#define IS_PINEVIEW_M(dev)	((dev)->pdev->device == 0xa011)

#define IS_PINEVIEW(dev)	(INTEL_INFO(dev)->is_pineview)

#define IS_G33(dev)		(INTEL_INFO(dev)->is_g33)

#define IS_IRONLAKE_M(dev)	((dev)->pci_device == 0x0046)

#define IS_IRONLAKE_M(dev)	((dev)->pdev->device == 0x0046)

#define IS_IVYBRIDGE(dev)	(INTEL_INFO(dev)->is_ivybridge)

#define IS_IVB_GT1(dev)		((dev)->pci_device == 0x0156 || \

				 (dev)->pci_device == 0x0152 ||	\

				 (dev)->pci_device == 0x015a)

#define IS_SNB_GT1(dev)		((dev)->pci_device == 0x0102 || \

				 (dev)->pci_device == 0x0106 ||	\

				 (dev)->pci_device == 0x010A)

#define IS_IVB_GT1(dev)		((dev)->pdev->device == 0x0156 || \

				 (dev)->pdev->device == 0x0152 || \

				 (dev)->pdev->device == 0x015a)

#define IS_SNB_GT1(dev)		((dev)->pdev->device == 0x0102 || \

				 (dev)->pdev->device == 0x0106 || \

				 (dev)->pdev->device == 0x010A)

#define IS_VALLEYVIEW(dev)	(INTEL_INFO(dev)->is_valleyview)

#define IS_HASWELL(dev)	(INTEL_INFO(dev)->is_haswell)

#define IS_MOBILE(dev)		(INTEL_INFO(dev)->is_mobile)

#define IS_HSW_EARLY_SDV(dev)	(IS_HASWELL(dev) && \

				 ((dev)->pci_device & 0xFF00) == 0x0C00)

				 ((dev)->pdev->device & 0xFF00) == 0x0C00)

#define IS_ULT(dev)		(IS_HASWELL(dev) && \

				 ((dev)->pci_device & 0xFF00) == 0x0A00)

				 ((dev)->pdev->device & 0xFF00) == 0x0A00)

#define IS_HSW_GT3(dev)		(IS_HASWELL(dev) && \

				 ((dev)->pci_device & 0x00F0) == 0x0020)

				 ((dev)->pdev->device & 0x00F0) == 0x0020)

#define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)



/*

drivers/gpu/drm/i915/i915_gpu_error.c

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, 
	err_printf(m, "Time: %ld s %ld us\n", error->time.tv_sec,

		   error->time.tv_usec);

	err_printf(m, "Kernel: " UTS_RELEASE "\n");

	err_printf(m, "PCI ID: 0x%04x\n", dev->pci_device);

	err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device);

	err_printf(m, "EIR: 0x%08x\n", error->eir);

	err_printf(m, "IER: 0x%08x\n", error->ier);

	err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er);