Revert "drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake."
authorPeter Antoine <peter.antoine@intel.com>
Thu, 30 Jun 2016 16:37:51 +0000 (09:37 -0700)
committerTvrtko Ursulin <tvrtko.ursulin@intel.com>
Mon, 4 Jul 2016 10:21:29 +0000 (11:21 +0100)
This reverts commit 2b81b84471b9

Cc: Christophe Prigent <christophe.prigent@intel.com>
Signed-off-by: Peter Antoine <peter.antoine@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
drivers/gpu/drm/i915/i915_drv.h

index 251a08d8808db748146278bb3b7e22525b6643a1..f0b1f43d0601cbc505190fa36e4002df820fbfbc 100644 (file)
@@ -2858,7 +2858,7 @@ struct drm_i915_cmd_table {
  * command submission once loaded. But these are logically independent
  * properties, so we have separate macros to test them.
  */
-#define HAS_GUC(dev)           (IS_GEN9(dev) && !IS_KABYLAKE(dev))
+#define HAS_GUC(dev)           (IS_GEN9(dev))
 #define HAS_GUC_UCODE(dev)     (HAS_GUC(dev))
 #define HAS_GUC_SCHED(dev)     (HAS_GUC(dev))