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

Commit c42b5da2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes 

Daniel wrote:

2 little patches:
- One regression fix to disable sdvo hotplug on broken hw.
- One patch to upconvert the snb hang workaround from patch v1 to patch
 v2.

* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
  drm/i915: Do no set Stencil Cache eviction LRA w/a on gen7+
  drm/i915: disable sdvo hotplug on i945g/gm
parents febb72a6 2e7a4481

drivers/gpu/drm/i915/intel_ringbuffer.c

+6 −3
Original line number Diff line number Diff line
@@ -398,10 +398,8 @@ static int init_render_ring(struct intel_ring_buffer *ring) 
			return ret;

	}



	if (INTEL_INFO(dev)->gen >= 6) {

		I915_WRITE(INSTPM,

			   INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);



	if (IS_GEN6(dev)) {

		/* From the Sandybridge PRM, volume 1 part 3, page 24:

		 * "If this bit is set, STCunit will have LRA as replacement

		 *  policy. [...] This bit must be reset.  LRA replacement
@@ -411,6 +409,11 @@ static int init_render_ring(struct intel_ring_buffer *ring) 
			   CM0_STC_EVICT_DISABLE_LRA_SNB << CM0_MASK_SHIFT);

	}



	if (INTEL_INFO(dev)->gen >= 6) {

		I915_WRITE(INSTPM,

			   INSTPM_FORCE_ORDERING << 16 | INSTPM_FORCE_ORDERING);

	}



	return ret;

}

drivers/gpu/drm/i915/intel_sdvo.c

+6 −0
Original line number Diff line number Diff line
@@ -1220,8 +1220,14 @@ static bool intel_sdvo_get_capabilities(struct intel_sdvo *intel_sdvo, struct in 


static int intel_sdvo_supports_hotplug(struct intel_sdvo *intel_sdvo)

{

	struct drm_device *dev = intel_sdvo->base.base.dev;

	u8 response[2];



	/* HW Erratum: SDVO Hotplug is broken on all i945G chips, there's noise

	 * on the line. */

	if (IS_I945G(dev) || IS_I945GM(dev))

		return false;



	return intel_sdvo_get_value(intel_sdvo, SDVO_CMD_GET_HOT_PLUG_SUPPORT,

				    &response, 2) && response[0];

}