[Intel-gfx] [PATCH] x86/gpu: add CFL to early quirks

[Joonas Lahtinen]

On Fri, 2017-12-08 at 10:47 -0800, Lucas De Marchi wrote:
> CFL was missing from intel_early_ids[].
> 
> Cc: Ingo Molnar <mingo at kernel.org>
> Cc: H. Peter Anvin <hpa at zytor.com>
> Cc: Thomas Gleixner <tglx at linutronix.de>
> Cc: x86 at kernel.org
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

This should come with a Fixes: line to be picked up to -fixes. The IDs
have been added in smaller chunks and reworked after, so backporting
will be required. For this level of fix, my recommendation would be to
actively provide a cleanly applying backports to affected stable
versions.

Counting from the first CFL PCI addition, this should have following
tags (adding them to this mail);

Fixes: b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")
Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
Cc: Jani Nikula <jani.nikula at linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
Cc: David Airlie <airlied at linux.ie>
Cc: intel-gfx at lists.freedesktop.org
Cc: dri-devel at lists.freedesktop.org
Cc: <stable at vger.kernel.org> # v4.13+

Please improve the commit message to describe why the code is critical
to be there and what is the impact on systems without the code. (Should
be something about RAM being arbitarily overwritten if you keep using
UEFI framebuffer for example, depending on how BIOS has set up the e820
map.)

Regards, Joonas

> ---
> 
> Like it was done for other platforms, ideally we should get an ack from x86
> maintainers and apply this through the drm-intel tree.
> 
>  arch/x86/kernel/early-quirks.c | 1 +
>  include/drm/i915_pciids.h      | 6 ++++++
>  2 files changed, 7 insertions(+)
> 
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index 1e82f787c160..c87560e1e3ef 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -527,6 +527,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_CFL_IDS(&gen9_early_ops),
>  	INTEL_GLK_IDS(&gen9_early_ops),
>  	INTEL_CNL_IDS(&gen9_early_ops),
>  };
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 972a25633525..c65e4489006d 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -392,6 +392,12 @@
>  	INTEL_VGA_DEVICE(0x3EA8, info), /* ULT GT3 */ \
>  	INTEL_VGA_DEVICE(0x3EA5, info)  /* ULT GT3 */
>  
> +#define INTEL_CFL_IDS(info) \
> +	INTEL_CFL_S_GT1_IDS(info), \
> +	INTEL_CFL_S_GT2_IDS(info), \
> +	INTEL_CFL_H_GT2_IDS(info), \
> +	INTEL_CFL_U_GT3_IDS(info)
> +
>  /* CNL U 2+2 */
>  #define INTEL_CNL_U_GT2_IDS(info) \
>  	INTEL_VGA_DEVICE(0x5A52, info), \
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation