[Intel-gfx] [PATCH 1/2] drm/i915/kbl: drm/i915: Avoid GuC loading for now on Kabylake.

[Yu Dai]

On 10/29/2015 10:22 AM, Rodrigo Vivi wrote:
> 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 at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index a5ba485..0e971cf 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2616,8 +2616,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)
Looks good to me.
Reviewed-by: Alex Dai <yu.dai at intel.com>

Alex