Commit e322551f authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Jani Nikula
Browse files

drm/i915/gt: Remove references to struct drm_device.pdev 



Using struct drm_device.pdev is deprecated. Convert i915 to struct
drm_device.dev. No functional changes.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210128133127.2311-3-tzimmermann@suse.de
parent 8ff5446a

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine) 


	/* Waiting to drain ELSP? */

	if (execlists_active(&engine->execlists)) {

		synchronize_hardirq(engine->i915->drm.pdev->irq);

		synchronize_hardirq(to_pci_dev(engine->i915->drm.dev)->irq);



		intel_engine_flush_submission(engine);

drivers/gpu/drm/i915/gt/intel_ggtt.c

+5 −5
Original line number Diff line number Diff line
@@ -769,7 +769,7 @@ static unsigned int chv_get_total_gtt_size(u16 gmch_ctrl) 
static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size)

{

	struct drm_i915_private *i915 = ggtt->vm.i915;

	struct pci_dev *pdev = i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	phys_addr_t phys_addr;

	int ret;
@@ -839,7 +839,7 @@ static struct resource pci_resource(struct pci_dev *pdev, int bar) 
static int gen8_gmch_probe(struct i915_ggtt *ggtt)

{

	struct drm_i915_private *i915 = ggtt->vm.i915;

	struct pci_dev *pdev = i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	unsigned int size;

	u16 snb_gmch_ctl;
@@ -983,7 +983,7 @@ static u64 iris_pte_encode(dma_addr_t addr, 
static int gen6_gmch_probe(struct i915_ggtt *ggtt)

{

	struct drm_i915_private *i915 = ggtt->vm.i915;

	struct pci_dev *pdev = i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	unsigned int size;

	u16 snb_gmch_ctl;
@@ -1046,7 +1046,7 @@ static int i915_gmch_probe(struct i915_ggtt *ggtt) 
	phys_addr_t gmadr_base;

	int ret;



	ret = intel_gmch_probe(i915->bridge_dev, i915->drm.pdev, NULL);

	ret = intel_gmch_probe(i915->bridge_dev, to_pci_dev(i915->drm.dev), NULL);

	if (!ret) {

		drm_err(&i915->drm, "failed to set up gmch\n");

		return -EIO;
@@ -1091,7 +1091,7 @@ static int ggtt_probe_hw(struct i915_ggtt *ggtt, struct intel_gt *gt) 


	ggtt->vm.gt = gt;

	ggtt->vm.i915 = i915;

	ggtt->vm.dma = &i915->drm.pdev->dev;

	ggtt->vm.dma = i915->drm.dev;



	if (INTEL_GEN(i915) <= 5)

		ret = i915_gmch_probe(ggtt);

drivers/gpu/drm/i915/gt/intel_ppgtt.c

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ void ppgtt_init(struct i915_ppgtt *ppgtt, struct intel_gt *gt) 


	ppgtt->vm.gt = gt;

	ppgtt->vm.i915 = i915;

	ppgtt->vm.dma = &i915->drm.pdev->dev;

	ppgtt->vm.dma = i915->drm.dev;

	ppgtt->vm.total = BIT_ULL(INTEL_INFO(i915)->ppgtt_size);



	i915_address_space_init(&ppgtt->vm, VM_CLASS_PPGTT);

drivers/gpu/drm/i915/gt/intel_rc6.c

+2 −2
Original line number Diff line number Diff line
@@ -485,14 +485,14 @@ static bool rc6_supported(struct intel_rc6 *rc6) 
static void rpm_get(struct intel_rc6 *rc6)

{

	GEM_BUG_ON(rc6->wakeref);

	pm_runtime_get_sync(&rc6_to_i915(rc6)->drm.pdev->dev);

	pm_runtime_get_sync(rc6_to_i915(rc6)->drm.dev);

	rc6->wakeref = true;

}



static void rpm_put(struct intel_rc6 *rc6)

{

	GEM_BUG_ON(!rc6->wakeref);

	pm_runtime_put(&rc6_to_i915(rc6)->drm.pdev->dev);

	pm_runtime_put(rc6_to_i915(rc6)->drm.dev);

	rc6->wakeref = false;

}

drivers/gpu/drm/i915/gt/intel_reset.c

+3 −3
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static int i915_do_reset(struct intel_gt *gt, 
			 intel_engine_mask_t engine_mask,

			 unsigned int retry)

{

	struct pci_dev *pdev = gt->i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);

	int err;



	/* Assert reset for at least 20 usec, and wait for acknowledgement. */
@@ -208,7 +208,7 @@ static int g33_do_reset(struct intel_gt *gt, 
			intel_engine_mask_t engine_mask,

			unsigned int retry)

{

	struct pci_dev *pdev = gt->i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);



	pci_write_config_byte(pdev, I915_GDRST, GRDOM_RESET_ENABLE);

	return wait_for_atomic(g4x_reset_complete(pdev), 50);
@@ -218,7 +218,7 @@ static int g4x_do_reset(struct intel_gt *gt, 
			intel_engine_mask_t engine_mask,

			unsigned int retry)

{

	struct pci_dev *pdev = gt->i915->drm.pdev;

	struct pci_dev *pdev = to_pci_dev(gt->i915->drm.dev);

	struct intel_uncore *uncore = gt->uncore;

	int ret;