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

Commit 005f8005 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Some final radeon and i915 fixes, black screens mostly"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon/cik: use a separate counter for CP init timeout
  drm/i915/hdmi: fix hdmi audio state readout
  drm/i915: Don't leak command parser tables on suspend/resume
  drm/radeon: add PX quirk for asus K53TK
  drm/radeon: add a backlight quirk for Amilo Xi 2550
  drm/radeon: add a module parameter for backlight control (v2)
  drm/radeon: Update IH_RB_RPTR register after each processed interrupt
  drm/radeon: Make IH ring overflow debugging output more useful
  drm/radeon: Clear RB_OVERFLOW bit earlier
parents b94d525e 67f33f30

drivers/gpu/drm/i915/i915_cmd_parser.c

+7 −5
Original line number Diff line number Diff line
@@ -709,12 +709,14 @@ int i915_cmd_parser_init_ring(struct intel_engine_cs *ring) 
	BUG_ON(!validate_cmds_sorted(ring, cmd_tables, cmd_table_count));

	BUG_ON(!validate_regs_sorted(ring));



	if (hash_empty(ring->cmd_hash)) {

		ret = init_hash_table(ring, cmd_tables, cmd_table_count);

		if (ret) {

			DRM_ERROR("CMD: cmd_parser_init failed!\n");

			fini_hash_table(ring);

			return ret;

		}

	}



	ring->needs_cmd_parser = true;

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static void intel_hdmi_get_config(struct intel_encoder *encoder, 
	if (tmp & HDMI_MODE_SELECT_HDMI)

		pipe_config->has_hdmi_sink = true;



	if (tmp & HDMI_MODE_SELECT_HDMI)

	if (tmp & SDVO_AUDIO_ENABLE)

		pipe_config->has_audio = true;



	if (!HAS_PCH_SPLIT(dev) &&

drivers/gpu/drm/radeon/cik.c

+6 −6
Original line number Diff line number Diff line
@@ -4803,7 +4803,7 @@ struct bonaire_mqd 
 */

static int cik_cp_compute_resume(struct radeon_device *rdev)

{

	int r, i, idx;

	int r, i, j, idx;

	u32 tmp;

	bool use_doorbell = true;

	u64 hqd_gpu_addr;
@@ -4922,7 +4922,7 @@ static int cik_cp_compute_resume(struct radeon_device *rdev) 
		mqd->queue_state.cp_hqd_pq_wptr= 0;

		if (RREG32(CP_HQD_ACTIVE) & 1) {

			WREG32(CP_HQD_DEQUEUE_REQUEST, 1);

			for (i = 0; i < rdev->usec_timeout; i++) {

			for (j = 0; j < rdev->usec_timeout; j++) {

				if (!(RREG32(CP_HQD_ACTIVE) & 1))

					break;

				udelay(1);
@@ -7751,17 +7751,17 @@ static inline u32 cik_get_ih_wptr(struct radeon_device *rdev) 
		wptr = RREG32(IH_RB_WPTR);



	if (wptr & RB_OVERFLOW) {

		wptr &= ~RB_OVERFLOW;

		/* When a ring buffer overflow happen start parsing interrupt

		 * from the last not overwritten vector (wptr + 16). Hopefully

		 * this should allow us to catchup.

		 */

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, %d, %d)\n",

			wptr, rdev->ih.rptr, (wptr + 16) + rdev->ih.ptr_mask);

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\n",

			 wptr, rdev->ih.rptr, (wptr + 16) & rdev->ih.ptr_mask);

		rdev->ih.rptr = (wptr + 16) & rdev->ih.ptr_mask;

		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}
@@ -8251,6 +8251,7 @@ int cik_irq_process(struct radeon_device *rdev) 
		/* wptr/rptr are in bytes! */

		rptr += 16;

		rptr &= rdev->ih.ptr_mask;

		WREG32(IH_RB_RPTR, rptr);

	}

	if (queue_hotplug)

		schedule_work(&rdev->hotplug_work);
@@ -8259,7 +8260,6 @@ int cik_irq_process(struct radeon_device *rdev) 
	if (queue_thermal)

		schedule_work(&rdev->pm.dpm.thermal.work);

	rdev->ih.rptr = rptr;

	WREG32(IH_RB_RPTR, rdev->ih.rptr);

	atomic_set(&rdev->ih.lock, 0);



	/* make sure wptr hasn't changed while processing */

drivers/gpu/drm/radeon/evergreen.c

+4 −4
Original line number Diff line number Diff line
@@ -4749,17 +4749,17 @@ static u32 evergreen_get_ih_wptr(struct radeon_device *rdev) 
		wptr = RREG32(IH_RB_WPTR);



	if (wptr & RB_OVERFLOW) {

		wptr &= ~RB_OVERFLOW;

		/* When a ring buffer overflow happen start parsing interrupt

		 * from the last not overwritten vector (wptr + 16). Hopefully

		 * this should allow us to catchup.

		 */

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, %d, %d)\n",

			wptr, rdev->ih.rptr, (wptr + 16) + rdev->ih.ptr_mask);

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\n",

			 wptr, rdev->ih.rptr, (wptr + 16) & rdev->ih.ptr_mask);

		rdev->ih.rptr = (wptr + 16) & rdev->ih.ptr_mask;

		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}
@@ -5137,6 +5137,7 @@ int evergreen_irq_process(struct radeon_device *rdev) 
		/* wptr/rptr are in bytes! */

		rptr += 16;

		rptr &= rdev->ih.ptr_mask;

		WREG32(IH_RB_RPTR, rptr);

	}

	if (queue_hotplug)

		schedule_work(&rdev->hotplug_work);
@@ -5145,7 +5146,6 @@ int evergreen_irq_process(struct radeon_device *rdev) 
	if (queue_thermal && rdev->pm.dpm_enabled)

		schedule_work(&rdev->pm.dpm.thermal.work);

	rdev->ih.rptr = rptr;

	WREG32(IH_RB_RPTR, rdev->ih.rptr);

	atomic_set(&rdev->ih.lock, 0);



	/* make sure wptr hasn't changed while processing */

drivers/gpu/drm/radeon/r600.c

+4 −4
Original line number Diff line number Diff line
@@ -3792,17 +3792,17 @@ static u32 r600_get_ih_wptr(struct radeon_device *rdev) 
		wptr = RREG32(IH_RB_WPTR);



	if (wptr & RB_OVERFLOW) {

		wptr &= ~RB_OVERFLOW;

		/* When a ring buffer overflow happen start parsing interrupt

		 * from the last not overwritten vector (wptr + 16). Hopefully

		 * this should allow us to catchup.

		 */

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, %d, %d)\n",

			wptr, rdev->ih.rptr, (wptr + 16) + rdev->ih.ptr_mask);

		dev_warn(rdev->dev, "IH ring buffer overflow (0x%08X, 0x%08X, 0x%08X)\n",

			 wptr, rdev->ih.rptr, (wptr + 16) & rdev->ih.ptr_mask);

		rdev->ih.rptr = (wptr + 16) & rdev->ih.ptr_mask;

		tmp = RREG32(IH_RB_CNTL);

		tmp |= IH_WPTR_OVERFLOW_CLEAR;

		WREG32(IH_RB_CNTL, tmp);

		wptr &= ~RB_OVERFLOW;

	}

	return (wptr & rdev->ih.ptr_mask);

}
@@ -4048,6 +4048,7 @@ int r600_irq_process(struct radeon_device *rdev) 
		/* wptr/rptr are in bytes! */

		rptr += 16;

		rptr &= rdev->ih.ptr_mask;

		WREG32(IH_RB_RPTR, rptr);

	}

	if (queue_hotplug)

		schedule_work(&rdev->hotplug_work);
@@ -4056,7 +4057,6 @@ int r600_irq_process(struct radeon_device *rdev) 
	if (queue_thermal && rdev->pm.dpm_enabled)

		schedule_work(&rdev->pm.dpm.thermal.work);

	rdev->ih.rptr = rptr;

	WREG32(IH_RB_RPTR, rdev->ih.rptr);

	atomic_set(&rdev->ih.lock, 0);



	/* make sure wptr hasn't changed while processing */