浏览代码

drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake.

GuC has no version for KBL published yet and it is not recommended
to load the Skylake one, so let's avoid loading this for now while
we don't have the proper GuC firmware for Kabylake.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Alex Dai <yu.dai@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1449622718-21684-1-git-send-email-rodrigo.vivi@intel.com
Rodrigo Vivi 9 年之前
父节点
当前提交
2b81b84471
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/gpu/drm/i915/i915_drv.h

+ 2 - 2
drivers/gpu/drm/i915/i915_drv.h

@@ -2598,8 +2598,8 @@ struct drm_i915_cmd_table {
 
 
 #define HAS_CSR(dev)	(IS_GEN9(dev))
 #define HAS_CSR(dev)	(IS_GEN9(dev))
 
 
-#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev))
-#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev))
+#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
+#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
 
 
 #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
 #define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \
 				    INTEL_INFO(dev)->gen >= 8)
 				    INTEL_INFO(dev)->gen >= 8)