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

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

Merge tag 'drm-intel-fixes-2015-11-30' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

few i915 fixes.

* tag 'drm-intel-fixes-2015-11-30' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Don't override output type for DDI HDMI
  drm/i915: Don't compare has_drrs strictly in pipe config
  drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling
parents 31ade3b8 2540058f

drivers/gpu/drm/i915/i915_gem_fence.c

+27 −9
Original line number Diff line number Diff line
@@ -642,11 +642,10 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) 
		}



		/* check for L-shaped memory aka modified enhanced addressing */

		if (IS_GEN4(dev)) {

			uint32_t ddc2 = I915_READ(DCC2);



			if (!(ddc2 & DCC2_MODIFIED_ENHANCED_DISABLE))

				dev_priv->quirks |= QUIRK_PIN_SWIZZLED_PAGES;

		if (IS_GEN4(dev) &&

		    !(I915_READ(DCC2) & DCC2_MODIFIED_ENHANCED_DISABLE)) {

			swizzle_x = I915_BIT_6_SWIZZLE_UNKNOWN;

			swizzle_y = I915_BIT_6_SWIZZLE_UNKNOWN;

		}



		if (dcc == 0xffffffff) {
@@ -675,16 +674,35 @@ i915_gem_detect_bit_6_swizzle(struct drm_device *dev) 
		 * matching, which was the case for the swizzling required in

		 * the table above, or from the 1-ch value being less than

		 * the minimum size of a rank.

		 *

		 * Reports indicate that the swizzling actually

		 * varies depending upon page placement inside the

		 * channels, i.e. we see swizzled pages where the

		 * banks of memory are paired and unswizzled on the

		 * uneven portion, so leave that as unknown.

		 */

		if (I915_READ16(C0DRB3) != I915_READ16(C1DRB3)) {

			swizzle_x = I915_BIT_6_SWIZZLE_NONE;

			swizzle_y = I915_BIT_6_SWIZZLE_NONE;

		} else {

		if (I915_READ16(C0DRB3) == I915_READ16(C1DRB3)) {

			swizzle_x = I915_BIT_6_SWIZZLE_9_10;

			swizzle_y = I915_BIT_6_SWIZZLE_9;

		}

	}



	if (swizzle_x == I915_BIT_6_SWIZZLE_UNKNOWN ||

	    swizzle_y == I915_BIT_6_SWIZZLE_UNKNOWN) {

		/* Userspace likes to explode if it sees unknown swizzling,

		 * so lie. We will finish the lie when reporting through

		 * the get-tiling-ioctl by reporting the physical swizzle

		 * mode as unknown instead.

		 *

		 * As we don't strictly know what the swizzling is, it may be

		 * bit17 dependent, and so we need to also prevent the pages

		 * from being moved.

		 */

		dev_priv->quirks |= QUIRK_PIN_SWIZZLED_PAGES;

		swizzle_x = I915_BIT_6_SWIZZLE_NONE;

		swizzle_y = I915_BIT_6_SWIZZLE_NONE;

	}



	dev_priv->mm.bit_6_swizzle_x = swizzle_x;

	dev_priv->mm.bit_6_swizzle_y = swizzle_y;

}

drivers/gpu/drm/i915/intel_display.c

+0 −1
Original line number Diff line number Diff line
@@ -12460,7 +12460,6 @@ intel_pipe_config_compare(struct drm_device *dev, 
	if (INTEL_INFO(dev)->gen < 8) {

		PIPE_CONF_CHECK_M_N(dp_m_n);



		PIPE_CONF_CHECK_I(has_drrs);

		if (current_config->has_drrs)

			PIPE_CONF_CHECK_M_N(dp_m2_n2);

	} else

drivers/gpu/drm/i915/intel_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -5153,7 +5153,8 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) 
	enum intel_display_power_domain power_domain;

	enum irqreturn ret = IRQ_NONE;



	if (intel_dig_port->base.type != INTEL_OUTPUT_EDP)

	if (intel_dig_port->base.type != INTEL_OUTPUT_EDP &&

	    intel_dig_port->base.type != INTEL_OUTPUT_HDMI)

		intel_dig_port->base.type = INTEL_OUTPUT_DISPLAYPORT;



	if (long_hpd && intel_dig_port->base.type == INTEL_OUTPUT_EDP) {