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

Commit 4b170692 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:
 "i915 has a bunch of fixes, and Russell found a bug in sysfs writing
  handling that results in userspace getting stuck"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm: fix writing to /sys/class/drm/*/status
  drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code
  drm/i915: Include G4X/VLV/CHV in self refresh status
  drm/i915: Initialize HWS page address after GPU reset
  drm/i915: Don't skip request retirement if the active list is empty
  drm/i915/hsw: Fix workaround for server AUX channel clock divisor
parents f46c5818 38d8571d

drivers/gpu/drm/drm_sysfs.c

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static ssize_t status_store(struct device *device, 


	mutex_unlock(&dev->mode_config.mutex);



	return ret;

	return ret ? ret : count;

}



static ssize_t status_show(struct device *device,

drivers/gpu/drm/i915/i915_debugfs.c

+4 −1
Original line number Diff line number Diff line
@@ -1667,12 +1667,15 @@ static int i915_sr_status(struct seq_file *m, void *unused) 


	if (HAS_PCH_SPLIT(dev))

		sr_enabled = I915_READ(WM1_LP_ILK) & WM1_LP_SR_EN;

	else if (IS_CRESTLINE(dev) || IS_I945G(dev) || IS_I945GM(dev))

	else if (IS_CRESTLINE(dev) || IS_G4X(dev) ||

		 IS_I945G(dev) || IS_I945GM(dev))

		sr_enabled = I915_READ(FW_BLC_SELF) & FW_BLC_SELF_EN;

	else if (IS_I915GM(dev))

		sr_enabled = I915_READ(INSTPM) & INSTPM_SELF_EN;

	else if (IS_PINEVIEW(dev))

		sr_enabled = I915_READ(DSPFW3) & PINEVIEW_SELF_REFRESH_EN;

	else if (IS_VALLEYVIEW(dev))

		sr_enabled = I915_READ(FW_BLC_SELF_VLV) & FW_CSPWRDWNEN;



	intel_runtime_pm_put(dev_priv);

drivers/gpu/drm/i915/i915_gem.c

+0 −3
Original line number Diff line number Diff line
@@ -2656,9 +2656,6 @@ void i915_gem_reset(struct drm_device *dev) 
void

i915_gem_retire_requests_ring(struct intel_engine_cs *ring)

{

	if (list_empty(&ring->request_list))

		return;



	WARN_ON(i915_verify_lists(ring->dev));



	/* Retire requests first as we use it above for the early return.

drivers/gpu/drm/i915/intel_dp.c

+2 −3
Original line number Diff line number Diff line
@@ -880,10 +880,8 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, 
				      DP_AUX_CH_CTL_RECEIVE_ERROR))

				continue;

			if (status & DP_AUX_CH_CTL_DONE)

				break;

				goto done;

		}

		if (status & DP_AUX_CH_CTL_DONE)

			break;

	}



	if ((status & DP_AUX_CH_CTL_DONE) == 0) {
@@ -892,6 +890,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, 
		goto out;

	}



done:

	/* Check for timeout or receive error.

	 * Timeouts occur when the sink is not connected

	 */

drivers/gpu/drm/i915/intel_lrc.c

+6 −0
Original line number Diff line number Diff line
@@ -1134,6 +1134,12 @@ static int gen8_init_common_ring(struct intel_engine_cs *ring) 
	I915_WRITE_IMR(ring, ~(ring->irq_enable_mask | ring->irq_keep_mask));

	I915_WRITE(RING_HWSTAM(ring->mmio_base), 0xffffffff);



	if (ring->status_page.obj) {

		I915_WRITE(RING_HWS_PGA(ring->mmio_base),

			   (u32)ring->status_page.gfx_addr);

		POSTING_READ(RING_HWS_PGA(ring->mmio_base));

	}



	I915_WRITE(RING_MODE_GEN7(ring),

		   _MASKED_BIT_DISABLE(GFX_REPLAY_MODE) |

		   _MASKED_BIT_ENABLE(GFX_RUN_LIST_ENABLE));