mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 15:20:41 +00:00
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()
This commit is contained in:
commit
062f531ab2
4 changed files with 7 additions and 7 deletions
|
@ -122,8 +122,11 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
|
||||||
has_full_48bit_ppgtt =
|
has_full_48bit_ppgtt =
|
||||||
IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9;
|
IS_BROADWELL(dev_priv) || INTEL_GEN(dev_priv) >= 9;
|
||||||
|
|
||||||
if (intel_vgpu_active(dev_priv))
|
if (intel_vgpu_active(dev_priv)) {
|
||||||
has_full_ppgtt = false; /* emulation is too hard */
|
/* emulation is too hard */
|
||||||
|
has_full_ppgtt = false;
|
||||||
|
has_full_48bit_ppgtt = false;
|
||||||
|
}
|
||||||
|
|
||||||
if (!has_aliasing_ppgtt)
|
if (!has_aliasing_ppgtt)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -158,7 +161,7 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
|
||||||
return 0;
|
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;
|
return has_full_48bit_ppgtt ? 3 : 2;
|
||||||
else
|
else
|
||||||
return has_aliasing_ppgtt ? 1 : 0;
|
return has_aliasing_ppgtt ? 1 : 0;
|
||||||
|
|
|
@ -65,9 +65,6 @@ void i915_check_vgpu(struct drm_i915_private *dev_priv)
|
||||||
|
|
||||||
BUILD_BUG_ON(sizeof(struct vgt_if) != VGT_PVINFO_SIZE);
|
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));
|
magic = __raw_i915_read64(dev_priv, vgtif_reg(magic));
|
||||||
if (magic != VGT_MAGIC)
|
if (magic != VGT_MAGIC)
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -554,7 +554,6 @@ void intel_dvo_init(struct drm_device *dev)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
drm_encoder_cleanup(&intel_encoder->base);
|
|
||||||
kfree(intel_dvo);
|
kfree(intel_dvo);
|
||||||
kfree(intel_connector);
|
kfree(intel_connector);
|
||||||
}
|
}
|
||||||
|
|
|
@ -7859,6 +7859,7 @@ static inline int gen6_check_mailbox_status(struct drm_i915_private *dev_priv)
|
||||||
case GEN6_PCODE_ILLEGAL_CMD:
|
case GEN6_PCODE_ILLEGAL_CMD:
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
case GEN6_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
|
case GEN6_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
|
||||||
|
case GEN7_PCODE_MIN_FREQ_TABLE_GT_RATIO_OUT_OF_RANGE:
|
||||||
return -EOVERFLOW;
|
return -EOVERFLOW;
|
||||||
case GEN6_PCODE_TIMEOUT:
|
case GEN6_PCODE_TIMEOUT:
|
||||||
return -ETIMEDOUT;
|
return -ETIMEDOUT;
|
||||||
|
|
Loading…
Reference in a new issue