Merge tag 'drm-intel-next-2017-12-01' of git://anongit.freedesktop.org/drm/drm-intel...

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

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 64e8ae1fd83211e6bc84634bb1ec36313958f18d..f3c35e82632191f9b1e2060149413861963c5087 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -178,7 +178,7 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,
                return 0;
        }
 
-       if (INTEL_GEN(dev_priv) >= 8 && i915_modparams.enable_execlists) {
+       if (HAS_LOGICAL_RING_CONTEXTS(dev_priv)) {
                if (has_full_48bit_ppgtt)
                        return 3;
 
@@ -2162,7 +2162,7 @@ int i915_ppgtt_init_hw(struct drm_i915_private *dev_priv)
        /* In the case of execlists, PPGTT is enabled by the context descriptor
         * and the PDPs are contained within the context itself.  We don't
         * need to do anything here. */
-       if (i915_modparams.enable_execlists)
+       if (HAS_LOGICAL_RING_CONTEXTS(dev_priv))
                return 0;
 
        if (!USES_PPGTT(dev_priv))
@@ -3737,9 +3737,6 @@ intel_rotate_pages(struct intel_rotation_info *rot_info,
                                  rot_info->plane[i].stride, st, sg);
        }
 
-       DRM_DEBUG_KMS("Created rotated page mapping for object size %zu (%ux%u tiles, %u pages)\n",
-                     obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
-
        kvfree(page_addr_list);
 
        return st;
@@ -3749,8 +3746,8 @@ err_sg_alloc:
 err_st_alloc:
        kvfree(page_addr_list);
 
-       DRM_DEBUG_KMS("Failed to create rotated mapping for object size %zu! (%ux%u tiles, %u pages)\n",
-                     obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
+       DRM_DEBUG_DRIVER("Failed to create rotated mapping for object size %zu! (%ux%u tiles, %u pages)\n",
+                        obj->base.size, rot_info->plane[0].width, rot_info->plane[0].height, size);
 
        return ERR_PTR(ret);
 }