diff mbox

[2/2] drm/i915/kbl: Kabylake uses the same GMS values as Skylake

Message ID 1446139321-2818-2-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
From: Deepak S <deepak.s@intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Deepak S <deepak.s@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 arch/x86/kernel/early-quirks.c | 1 +
 1 file changed, 1 insertion(+)

Comments

kernel test robot Oct. 29, 2015, 5:53 p.m. UTC | #1
Hi Deepak,

[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: x86_64-randconfig-x008-10252017 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

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

>> arch/x86/kernel/early-quirks.c:550:2: error: implicit declaration of function 'INTEL_KBL_IDS' [-Werror=implicit-function-declaration]
     INTEL_KBL_IDS(&gen9_stolen_funcs),
     ^
>> arch/x86/kernel/early-quirks.c:550:2: error: initializer element is not constant
   arch/x86/kernel/early-quirks.c:550:2: note: (near initialization for 'intel_stolen_ids[156].vendor')
>> arch/x86/kernel/early-quirks.c:520:68: warning: missing braces around initializer [-Wmissing-braces]
    static const struct pci_device_id intel_stolen_ids[] __initconst = {
                                                                       ^
   arch/x86/kernel/early-quirks.c:520:68: note: (near initialization for 'intel_stolen_ids')
   cc1: some warnings being treated as errors

vim +/INTEL_KBL_IDS +550 arch/x86/kernel/early-quirks.c

   514	
   515	static const struct intel_stolen_funcs chv_stolen_funcs __initconst = {
   516		.base = intel_stolen_base,
   517		.size = chv_stolen_size,
   518	};
   519	
 > 520	static const struct pci_device_id intel_stolen_ids[] __initconst = {
   521		INTEL_I830_IDS(&i830_stolen_funcs),
   522		INTEL_I845G_IDS(&i845_stolen_funcs),
   523		INTEL_I85X_IDS(&i85x_stolen_funcs),
   524		INTEL_I865G_IDS(&i865_stolen_funcs),
   525		INTEL_I915G_IDS(&gen3_stolen_funcs),
   526		INTEL_I915GM_IDS(&gen3_stolen_funcs),
   527		INTEL_I945G_IDS(&gen3_stolen_funcs),
   528		INTEL_I945GM_IDS(&gen3_stolen_funcs),
   529		INTEL_VLV_M_IDS(&gen6_stolen_funcs),
   530		INTEL_VLV_D_IDS(&gen6_stolen_funcs),
   531		INTEL_PINEVIEW_IDS(&gen3_stolen_funcs),
   532		INTEL_I965G_IDS(&gen3_stolen_funcs),
   533		INTEL_G33_IDS(&gen3_stolen_funcs),
   534		INTEL_I965GM_IDS(&gen3_stolen_funcs),
   535		INTEL_GM45_IDS(&gen3_stolen_funcs),
   536		INTEL_G45_IDS(&gen3_stolen_funcs),
   537		INTEL_IRONLAKE_D_IDS(&gen3_stolen_funcs),
   538		INTEL_IRONLAKE_M_IDS(&gen3_stolen_funcs),
   539		INTEL_SNB_D_IDS(&gen6_stolen_funcs),
   540		INTEL_SNB_M_IDS(&gen6_stolen_funcs),
   541		INTEL_IVB_M_IDS(&gen6_stolen_funcs),
   542		INTEL_IVB_D_IDS(&gen6_stolen_funcs),
   543		INTEL_HSW_D_IDS(&gen6_stolen_funcs),
   544		INTEL_HSW_M_IDS(&gen6_stolen_funcs),
   545		INTEL_BDW_M_IDS(&gen8_stolen_funcs),
   546		INTEL_BDW_D_IDS(&gen8_stolen_funcs),
   547		INTEL_CHV_IDS(&chv_stolen_funcs),
   548		INTEL_SKL_IDS(&gen9_stolen_funcs),
   549		INTEL_BXT_IDS(&gen9_stolen_funcs),
 > 550		INTEL_KBL_IDS(&gen9_stolen_funcs),
   551	};
   552	
   553	static void __init intel_graphics_stolen(int num, int slot, int func)

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Rodrigo Vivi Nov. 4, 2015, 11:35 p.m. UTC | #2
Hi Jani,

could you please consider to merge this already reviewed patch.

Thanks,
Rodrigo.

On Thu, Oct 29, 2015 at 10:22 AM Rodrigo Vivi <rodrigo.vivi@intel.com>
wrote:

> From: Deepak S <deepak.s@intel.com>
>
> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
> Signed-off-by: Deepak S <deepak.s@intel.com>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
> ---
>  arch/x86/kernel/early-quirks.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/kernel/early-quirks.c
> b/arch/x86/kernel/early-quirks.c
> index 9f9cc68..5b85bf0 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -547,6 +547,7 @@ static const struct pci_device_id intel_stolen_ids[]
> __initconst = {
>         INTEL_CHV_IDS(&chv_stolen_funcs),
>         INTEL_SKL_IDS(&gen9_stolen_funcs),
>         INTEL_BXT_IDS(&gen9_stolen_funcs),
> +       INTEL_KBL_IDS(&gen9_stolen_funcs),
>  };
>
>  static void __init intel_graphics_stolen(int num, int slot, int func)
> --
> 2.4.3
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
Jani Nikula Nov. 5, 2015, 1:17 p.m. UTC | #3
On Thu, 05 Nov 2015, Rodrigo Vivi <rodrigo.vivi@gmail.com> wrote:
> Hi Jani,
>
> could you please consider to merge this already reviewed patch.

Pushed to drm-intel-next-queued, thanks for the patch and review.

BR,
Jani.


>
> Thanks,
> Rodrigo.
>
> On Thu, Oct 29, 2015 at 10:22 AM Rodrigo Vivi <rodrigo.vivi@intel.com>
> wrote:
>
>> From: Deepak S <deepak.s@intel.com>
>>
>> Reviewed-by: Damien Lespiau <damien.lespiau@intel.com>
>> Signed-off-by: Deepak S <deepak.s@intel.com>
>> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
>> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> ---
>>  arch/x86/kernel/early-quirks.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/x86/kernel/early-quirks.c
>> b/arch/x86/kernel/early-quirks.c
>> index 9f9cc68..5b85bf0 100644
>> --- a/arch/x86/kernel/early-quirks.c
>> +++ b/arch/x86/kernel/early-quirks.c
>> @@ -547,6 +547,7 @@ static const struct pci_device_id intel_stolen_ids[]
>> __initconst = {
>>         INTEL_CHV_IDS(&chv_stolen_funcs),
>>         INTEL_SKL_IDS(&gen9_stolen_funcs),
>>         INTEL_BXT_IDS(&gen9_stolen_funcs),
>> +       INTEL_KBL_IDS(&gen9_stolen_funcs),
>>  };
>>
>>  static void __init intel_graphics_stolen(int num, int slot, int func)
>> --
>> 2.4.3
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>>
diff mbox

Patch

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 9f9cc68..5b85bf0 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -547,6 +547,7 @@  static const struct pci_device_id intel_stolen_ids[] __initconst = {
 	INTEL_CHV_IDS(&chv_stolen_funcs),
 	INTEL_SKL_IDS(&gen9_stolen_funcs),
 	INTEL_BXT_IDS(&gen9_stolen_funcs),
+	INTEL_KBL_IDS(&gen9_stolen_funcs),
 };
 
 static void __init intel_graphics_stolen(int num, int slot, int func)