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

Commit 062f531a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2016-09-08' of git://anongit.freedesktop.org/drm-intel into drm-fixes 

i915 fixes from Jani.

* tag 'drm-intel-fixes-2016-09-08' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Add GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE to SNB
  drm/i915: disable 48bit full PPGTT when vGPU is active
  drm/i915: enable vGPU detection for all
  drm/i915/dvo: Remove dangling call to drm_encoder_cleanup()
parents 603f2c9f fc2780b6

drivers/gpu/drm/i915/i915_gem_gtt.c

+6 −3
Original line number Diff line number Diff line
@@ -122,8 +122,11 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, 
	has_full_48bit_ppgtt =

	       	IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9;



	if (intel_vgpu_active(dev_priv))

		has_full_ppgtt = false; /* emulation is too hard */

	if (intel_vgpu_active(dev_priv)) {

		/* emulation is too hard */

		has_full_ppgtt = false;

		has_full_48bit_ppgtt = false;

	}



	if (!has_aliasing_ppgtt)

		return 0;
@@ -158,7 +161,7 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv, 
		return 0;

	}



	if (INTEL_GEN(dev_priv) >= 8 && i915.enable_execlists)

	if (INTEL_GEN(dev_priv) >= 8 && i915.enable_execlists && has_full_ppgtt)

		return has_full_48bit_ppgtt ? 3 : 2;

	else

		return has_aliasing_ppgtt ? 1 : 0;

drivers/gpu/drm/i915/i915_vgpu.c

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ void i915_check_vgpu(struct drm_i915_private *dev_priv) 


	BUILD_BUG_ON(sizeof(struct vgt_if) != VGT_PVINFO_SIZE);



	if (!IS_HASWELL(dev_priv))

		return;



	magic = __raw_i915_read64(dev_priv, vgtif_reg(magic));

	if (magic != VGT_MAGIC)

		return;

drivers/gpu/drm/i915/intel_dvo.c

+0 −1
Original line number Diff line number Diff line
@@ -554,7 +554,6 @@ void intel_dvo_init(struct drm_device *dev) 
		return;

	}



	drm_encoder_cleanup(&intel_encoder->base);

	kfree(intel_dvo);

	kfree(intel_connector);

}

drivers/gpu/drm/i915/intel_pm.c

+1 −0
Original line number Diff line number Diff line
@@ -7859,6 +7859,7 @@ static inline int gen6_check_mailbox_status(struct drm_i915_private *dev_priv) 
	case GEN6_PCODE_ILLEGAL_CMD:

		return -ENXIO;

	case GEN6_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:

	case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:

		return -EOVERFLOW;

	case GEN6_PCODE_TIMEOUT:

		return -ETIMEDOUT;