Merge tag 'topic/hdcp-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc into...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / intel_uncore.c

diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 129c8ac77985a8f8d960c09dc196eb3476d4501b..164dbb8cfa3682385986447c853997301a4b9f02 100644 (file)
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1452,7 +1452,7 @@ static const struct reg_whitelist {
 } reg_read_whitelist[] = { {
        .offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
        .offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
-       .gen_mask = INTEL_GEN_MASK(4, 10),
+       .gen_mask = INTEL_GEN_MASK(4, 11),
        .size = 8
 } };
 
@@ -1945,8 +1945,7 @@ int intel_reset_guc(struct drm_i915_private *dev_priv)
 {
        int ret;
 
-       if (!HAS_GUC(dev_priv))
-               return -EINVAL;
+       GEM_BUG_ON(!HAS_GUC(dev_priv));
 
        intel_uncore_forcewake_get(dev_priv, FORCEWAKE_ALL);
        ret = gen6_hw_domain_reset(dev_priv, GEN9_GRDOM_GUC);