diff mbox

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

Message ID 1446139321-2818-1-git-send-email-rodrigo.vivi@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Rodrigo Vivi Oct. 29, 2015, 5:22 p.m. UTC
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>
---
 drivers/gpu/drm/i915/i915_drv.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

kernel test robot Oct. 29, 2015, 8:02 p.m. UTC | #1
Hi Rodrigo,

[auto build test ERROR on drm-intel/for-linux-next -- if it's inappropriate base, please suggest rules for selecting the more suitable base]

url:    https://github.com/0day-ci/linux/commits/Rodrigo-Vivi/drm-i915-kbl-drm-i915-Avoid-GuC-loading-for-now-on-Kabylake/20151030-012505
config: i386-defconfig (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All error/warnings (new ones prefixed by >>):

   In file included from drivers/gpu/drm/i915/intel_pm.c:29:0:
   drivers/gpu/drm/i915/intel_pm.c: In function 'gen9_enable_rc6':
>> drivers/gpu/drm/i915/i915_drv.h:2587:46: error: implicit declaration of function 'IS_KABYLAKE' [-Werror=implicit-function-declaration]
    #define HAS_GUC_UCODE(dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))
                                                 ^
>> drivers/gpu/drm/i915/intel_pm.c:4790:6: note: in expansion of macro 'HAS_GUC_UCODE'
     if (HAS_GUC_UCODE(dev))
         ^
   cc1: some warnings being treated as errors
--
   In file included from drivers/gpu/drm/i915/intel_drv.h:32:0,
                    from drivers/gpu/drm/i915/i915_debugfs.c:38:
   drivers/gpu/drm/i915/i915_debugfs.c: In function 'i915_guc_load_status_info':
>> drivers/gpu/drm/i915/i915_drv.h:2587:46: error: implicit declaration of function 'IS_KABYLAKE' [-Werror=implicit-function-declaration]
    #define HAS_GUC_UCODE(dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))
                                                 ^
>> drivers/gpu/drm/i915/i915_debugfs.c:2392:7: note: in expansion of macro 'HAS_GUC_UCODE'
     if (!HAS_GUC_UCODE(dev_priv->dev))
          ^
   cc1: some warnings being treated as errors
--
   In file included from drivers/gpu/drm/i915/i915_gem.c:31:0:
   drivers/gpu/drm/i915/i915_gem.c: In function 'i915_gem_init_hw':
>> drivers/gpu/drm/i915/i915_drv.h:2587:46: error: implicit declaration of function 'IS_KABYLAKE' [-Werror=implicit-function-declaration]
    #define HAS_GUC_UCODE(dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))
                                                 ^
>> drivers/gpu/drm/i915/i915_gem.c:4750:6: note: in expansion of macro 'HAS_GUC_UCODE'
     if (HAS_GUC_UCODE(dev)) {
         ^
   cc1: some warnings being treated as errors
--
   In file included from drivers/gpu/drm/i915/intel_guc_loader.c:30:0:
   drivers/gpu/drm/i915/intel_guc_loader.c: In function 'intel_guc_ucode_init':
   drivers/gpu/drm/i915/i915_drv.h:2588:46: error: implicit declaration of function 'IS_KABYLAKE' [-Werror=implicit-function-declaration]
    #define HAS_GUC_SCHED(dev) (IS_GEN9(dev) && !IS_KABYLAKE(dev))
                                                 ^
>> drivers/gpu/drm/i915/intel_guc_loader.c:555:7: note: in expansion of macro 'HAS_GUC_SCHED'
     if (!HAS_GUC_SCHED(dev))
          ^
   cc1: some warnings being treated as errors

vim +/IS_KABYLAKE +2587 drivers/gpu/drm/i915/i915_drv.h

  2581					 IS_SKYLAKE(dev))
  2582	#define HAS_RC6(dev)		(INTEL_INFO(dev)->gen >= 6)
  2583	#define HAS_RC6p(dev)		(INTEL_INFO(dev)->gen == 6 || IS_IVYBRIDGE(dev))
  2584	
  2585	#define HAS_CSR(dev)	(IS_GEN9(dev))
  2586	
> 2587	#define HAS_GUC_UCODE(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
  2588	#define HAS_GUC_SCHED(dev)	(IS_GEN9(dev) && !IS_KABYLAKE(dev))
  2589	
  2590	#define HAS_RESOURCE_STREAMER(dev) (IS_HASWELL(dev) || \

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
yu.dai@intel.com Nov. 6, 2015, 7:08 p.m. UTC | #2
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@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@intel.com>

Alex
diff mbox

Patch

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)