drm/i915/uncore: use new struct drm_device based macros. (d0208cfa) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_uncore.c

+13 −12

Original line number	Diff line number	Diff line
		@@ -359,7 +359,8 @@ static void __gen6_gt_wait_for_fifo(struct intel_uncore *uncore)
		if (wait_for_atomic((n = fifo_free_entries(uncore)) >
		GT_FIFO_NUM_RESERVED_ENTRIES,
		GT_FIFO_TIMEOUT_MS)) {
		DRM_DEBUG("GT_FIFO timeout, entries: %u\n", n);
		drm_dbg(&uncore->i915->drm,
		"GT_FIFO timeout, entries: %u\n", n);
		return;
		}
		}
		@@ -432,7 +433,7 @@ intel_uncore_forcewake_reset(struct intel_uncore *uncore)
		break;

		if (--retry_count == 0) {
		DRM_ERROR("Timed out waiting for forcewake timers to finish\n");
		drm_err(&uncore->i915->drm, "Timed out waiting for forcewake timers to finish\n");
		break;
		}

		@@ -490,7 +491,7 @@ gen6_check_for_fifo_debug(struct intel_uncore *uncore)
		fifodbg = __raw_uncore_read32(uncore, GTFIFODBG);

		if (unlikely(fifodbg)) {
		DRM_DEBUG_DRIVER("GTFIFODBG = 0x08%x\n", fifodbg);
		drm_dbg(&uncore->i915->drm, "GTFIFODBG = 0x08%x\n", fifodbg);
		__raw_uncore_write32(uncore, GTFIFODBG, fifodbg);
		}

		@@ -562,7 +563,7 @@ void intel_uncore_resume_early(struct intel_uncore *uncore)
		unsigned int restore_forcewake;

		if (intel_uncore_unclaimed_mmio(uncore))
		DRM_DEBUG("unclaimed mmio detected on resume, clearing\n");
		drm_dbg(&uncore->i915->drm, "unclaimed mmio detected on resume, clearing\n");

		if (!intel_uncore_has_forcewake(uncore))
		return;
		@@ -1595,8 +1596,8 @@ static int intel_uncore_fw_domains_init(struct intel_uncore *uncore)
		spin_unlock_irq(&uncore->lock);

		if (!(ecobus & FORCEWAKE_MT_ENABLE)) {
		DRM_INFO("No MT forcewake available on Ivybridge, this can result in issues\n");
		DRM_INFO("when using vblank-synced partial screen updates.\n");
		drm_info(&i915->drm, "No MT forcewake available on Ivybridge, this can result in issues\n");
		drm_info(&i915->drm, "when using vblank-synced partial screen updates.\n");
		fw_domain_fini(uncore, FW_DOMAIN_ID_RENDER);
		fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
		FORCEWAKE, FORCEWAKE_ACK);
		@@ -1683,8 +1684,7 @@ static int uncore_mmio_setup(struct intel_uncore *uncore)
		mmio_size = 2 * 1024 * 1024;
		uncore->regs = pci_iomap(pdev, mmio_bar, mmio_size);
		if (uncore->regs == NULL) {
		DRM_ERROR("failed to map registers\n");

		drm_err(&i915->drm, "failed to map registers\n");
		return -EIO;
		}

		@@ -1807,7 +1807,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore)

		/* clear out unclaimed reg detection bit */
		if (intel_uncore_unclaimed_mmio(uncore))
		DRM_DEBUG("unclaimed mmio detected on uncore init, clearing\n");
		drm_dbg(&i915->drm, "unclaimed mmio detected on uncore init, clearing\n");

		return 0;

		@@ -2072,7 +2072,8 @@ intel_uncore_arm_unclaimed_mmio_detection(struct intel_uncore *uncore)

		if (unlikely(check_for_unclaimed_mmio(uncore))) {
		if (!i915_modparams.mmio_debug) {
		DRM_DEBUG("Unclaimed register detected, "
		drm_dbg(&uncore->i915->drm,
		"Unclaimed register detected, "
		"enabling oneshot unclaimed register reporting. "
		"Please use i915.mmio_debug=N for more information.\n");
		i915_modparams.mmio_debug++;

Admin message