diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2015-12-08 16:58:38 -0800 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2015-12-08 17:04:32 -0800 |
| commit | 2b81b84471b9a58173cb4198a3e5ab5dc685c2f1 (patch) | |
| tree | 1b740b68033c3ec049f1eec8826a95cd419ece63 | |
| parent | a5b7991c0a7b3ea33bc2848f6dc701f170e23b64 (diff) | |
| download | linux-2b81b84471b9a58173cb4198a3e5ab5dc685c2f1.tar.gz linux-2b81b84471b9a58173cb4198a3e5ab5dc685c2f1.tar.bz2 linux-2b81b84471b9a58173cb4198a3e5ab5dc685c2f1.zip | |
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
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 135759221a79..6dee97c0d5d0 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/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_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) || \ INTEL_INFO(dev)->gen >= 8) |