x86/gpu: GLK uses the same GMS values as SKL

Commit Message

Zanoni, Paulo R Jan. 24, 2017, 6:47 p.m. UTC

So don't forget to reserve its stolen memory bits.

Cc: Ingo Molnar <[e-mail]>
Cc: H. Peter Anvin <[e-mail]>
Cc: Ander Conselvan de Oliveira <[e-mail]>
Cc: [e-mail]
Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
Signed-off-by: Paulo Zanoni <[e-mail]>
---
 arch/x86/kernel/early-quirks.c | 1 +
 1 file changed, 1 insertion(+)

Found by code inspection. This is completely untested since I don't have
GLK hardware.

Comments

Ingo Molnar Jan. 25, 2017, 7:29 a.m. UTC | #1

* Paulo Zanoni <[e-mail]> wrote:

> So don't forget to reserve its stolen memory bits.
> 
> Cc: Ingo Molnar <[e-mail]>
> Cc: H. Peter Anvin <[e-mail]>
> Cc: Ander Conselvan de Oliveira <[e-mail]>
> Cc: [e-mail]
> Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
> Signed-off-by: Paulo Zanoni <[e-mail]>
> ---
>  arch/x86/kernel/early-quirks.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> Found by code inspection. This is completely untested since I don't have
> GLK hardware.
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 6a08e25..23c4f1c 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -526,6 +526,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>  	INTEL_SKL_IDS(&gen9_early_ops),
>  	INTEL_BXT_IDS(&gen9_early_ops),
>  	INTEL_KBL_IDS(&gen9_early_ops),
> +	INTEL_GLK_IDS(&gen9_early_ops),
>  };

There's no INTEL_GLK_IDS() upstream - is there any dependency here on other 
changes to the i915 GPU driver?

Thanks,

	Ingo

Jani Nikula Jan. 25, 2017, 11:31 a.m. UTC | #2

On Wed, 25 Jan 2017, Ingo Molnar <[e-mail]> wrote:
> * Paulo Zanoni <[e-mail]> wrote:
>
>> So don't forget to reserve its stolen memory bits.
>> 
>> Cc: Ingo Molnar <[e-mail]>
>> Cc: H. Peter Anvin <[e-mail]>
>> Cc: Ander Conselvan de Oliveira <[e-mail]>
>> Cc: [e-mail]
>> Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
>> Signed-off-by: Paulo Zanoni <[e-mail]>
>> ---
>>  arch/x86/kernel/early-quirks.c | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> Found by code inspection. This is completely untested since I don't have
>> GLK hardware.
>> 
>> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
>> index 6a08e25..23c4f1c 100644
>> --- a/arch/x86/kernel/early-quirks.c
>> +++ b/arch/x86/kernel/early-quirks.c
>> @@ -526,6 +526,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>>  	INTEL_SKL_IDS(&gen9_early_ops),
>>  	INTEL_BXT_IDS(&gen9_early_ops),
>>  	INTEL_KBL_IDS(&gen9_early_ops),
>> +	INTEL_GLK_IDS(&gen9_early_ops),
>>  };
>
> There's no INTEL_GLK_IDS() upstream - is there any dependency here on other 
> changes to the i915 GPU driver?

It's in our -next. Ack for merging this through drm-intel along with the
deps?

BR,
Jani.

>
> Thanks,
>
> 	Ingo
> _______________________________________________
> Intel-gfx mailing list
> [e-mail]
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Jani Nikula Jan. 25, 2017, 11:33 a.m. UTC | #3

(Now without the typo in Daniel's address; apologies for the extra
noise.)

On Wed, 25 Jan 2017, Jani Nikula <[e-mail]> wrote:
> On Wed, 25 Jan 2017, Ingo Molnar <[e-mail]> wrote:
>> * Paulo Zanoni <[e-mail]> wrote:
>>
>>> So don't forget to reserve its stolen memory bits.
>>> 
>>> Cc: Ingo Molnar <[e-mail]>
>>> Cc: H. Peter Anvin <[e-mail]>
>>> Cc: Ander Conselvan de Oliveira <[e-mail]>
>>> Cc: [e-mail]
>>> Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
>>> Signed-off-by: Paulo Zanoni <[e-mail]>
>>> ---
>>>  arch/x86/kernel/early-quirks.c | 1 +
>>>  1 file changed, 1 insertion(+)
>>> 
>>> Found by code inspection. This is completely untested since I don't have
>>> GLK hardware.
>>> 
>>> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
>>> index 6a08e25..23c4f1c 100644
>>> --- a/arch/x86/kernel/early-quirks.c
>>> +++ b/arch/x86/kernel/early-quirks.c
>>> @@ -526,6 +526,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
>>>  	INTEL_SKL_IDS(&gen9_early_ops),
>>>  	INTEL_BXT_IDS(&gen9_early_ops),
>>>  	INTEL_KBL_IDS(&gen9_early_ops),
>>> +	INTEL_GLK_IDS(&gen9_early_ops),
>>>  };
>>
>> There's no INTEL_GLK_IDS() upstream - is there any dependency here on other 
>> changes to the i915 GPU driver?
>
> It's in our -next. Ack for merging this through drm-intel along with the
> deps?
>
> BR,
> Jani.
>
>>
>> Thanks,
>>
>> 	Ingo
>> _______________________________________________
>> Intel-gfx mailing list
>> [e-mail]
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Ingo Molnar Jan. 25, 2017, 11:37 a.m. UTC | #4

* Jani Nikula <[e-mail]> wrote:

> On Wed, 25 Jan 2017, Jani Nikula <[e-mail]> wrote:
> > On Wed, 25 Jan 2017, Ingo Molnar <[e-mail]> wrote:
> >> * Paulo Zanoni <[e-mail]> wrote:
> >>
> >>> So don't forget to reserve its stolen memory bits.
> >>> 
> >>> Cc: Ingo Molnar <[e-mail]>
> >>> Cc: H. Peter Anvin <[e-mail]>
> >>> Cc: Ander Conselvan de Oliveira <[e-mail]>
> >>> Cc: [e-mail]
> >>> Reviewed-by: Ander Conselvan de Oliveira <[e-mail]>
> >>> Signed-off-by: Paulo Zanoni <[e-mail]>
> >>> ---
> >>>  arch/x86/kernel/early-quirks.c | 1 +
> >>>  1 file changed, 1 insertion(+)
> >>> 
> >>> Found by code inspection. This is completely untested since I don't have
> >>> GLK hardware.
> >>> 
> >>> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> >>> index 6a08e25..23c4f1c 100644
> >>> --- a/arch/x86/kernel/early-quirks.c
> >>> +++ b/arch/x86/kernel/early-quirks.c
> >>> @@ -526,6 +526,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = {
> >>>  	INTEL_SKL_IDS(&gen9_early_ops),
> >>>  	INTEL_BXT_IDS(&gen9_early_ops),
> >>>  	INTEL_KBL_IDS(&gen9_early_ops),
> >>> +	INTEL_GLK_IDS(&gen9_early_ops),
> >>>  };
> >>
> >> There's no INTEL_GLK_IDS() upstream - is there any dependency here on other 
> >> changes to the i915 GPU driver?
> >
> > It's in our -next. Ack for merging this through drm-intel along with the
> > deps?

Yeah, LGTM:

  Acked-by: Ingo Molnar <[e-mail]>

Thanks,

	Ingo

Patch

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 6a08e25..23c4f1c 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -526,6 +526,7 @@  static const struct pci_device_id intel_early_ids[] __initconst = {
 	INTEL_SKL_IDS(&gen9_early_ops),
 	INTEL_BXT_IDS(&gen9_early_ops),
 	INTEL_KBL_IDS(&gen9_early_ops),
+	INTEL_GLK_IDS(&gen9_early_ops),
 };
 
 static void __init