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

[Jani Nikula]

On Wed, 13 Dec 2017, Lucas De Marchi <lucas.demarchi at intel.com> wrote:
> CFL was missing from intel_early_ids[]. The PCI ID needs to be there to
> allow the memory region to be stolen, otherwise we could have RAM being
> arbitrarily overwritten if for example we keep using the UEFI framebuffer,
> depending on how BIOS has set up the e820 map.
>
> Fixes: b056f8f3d6b9 ("drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus.")
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> 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: 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: <stable at vger.kernel.org> # v4.13+ 0890540e21cf drm/i915: add GT number to intel_device_info
> Cc: <stable at vger.kernel.org> # v4.13+ 41693fd52373 drm/i915/kbl: Change a KBL pci id to GT2 from GT1.5
> Cc: <stable at vger.kernel.org> # v4.13+

Agreed on the Fixes: and Cc: stable here.

Acked-by: Jani Nikula <jani.nikula at intel.com>

> Reviewed-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
> ---
>
> v2: improve commit message, add Fixes tag and CC stable
>
>  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 3cbb2c78a9df..bae0d32e327b 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -528,6 +528,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), \

-- 
Jani Nikula, Intel Open Source Technology Center