lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 014/563] x86/gpu: Reserve stolen memory for first integrated Intel GPU
    Date
    From: Lucas De Marchi <lucas.demarchi@intel.com>

    commit 9c494ca4d3a535f9ca11ad6af1813983c1c6cbdd upstream.

    "Stolen memory" is memory set aside for use by an Intel integrated GPU.
    The intel_graphics_quirks() early quirk reserves this memory when it is
    called for a GPU that appears in the intel_early_ids[] table of integrated
    GPUs.

    Previously intel_graphics_quirks() was marked as QFLAG_APPLY_ONCE, so it
    was called only for the first Intel GPU found. If a discrete GPU happened
    to be enumerated first, intel_graphics_quirks() was called for it but not
    for any integrated GPU found later. Therefore, stolen memory for such an
    integrated GPU was never reserved.

    For example, this problem occurs in this Alderlake-P (integrated) + DG2
    (discrete) topology where the DG2 is found first, but stolen memory is
    associated with the integrated GPU:

    - 00:01.0 Bridge
    `- 03:00.0 DG2 discrete GPU
    - 00:02.0 Integrated GPU (with stolen memory)

    Remove the QFLAG_APPLY_ONCE flag and call intel_graphics_quirks() for every
    Intel GPU. Reserve stolen memory for the first GPU that appears in
    intel_early_ids[].

    [bhelgaas: commit log, add code comment, squash in
    https://lore.kernel.org/r/20220118190558.2ququ4vdfjuahicm@ldmartin-desk2]
    Link: https://lore.kernel.org/r/20220114002843.2083382-1-lucas.demarchi@intel.com
    Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/kernel/early-quirks.c | 10 +++++++++-
    1 file changed, 9 insertions(+), 1 deletion(-)

    --- a/arch/x86/kernel/early-quirks.c
    +++ b/arch/x86/kernel/early-quirks.c
    @@ -515,6 +515,7 @@ static const struct intel_early_ops gen1
    .stolen_size = gen9_stolen_size,
    };

    +/* Intel integrated GPUs for which we need to reserve "stolen memory" */
    static const struct pci_device_id intel_early_ids[] __initconst = {
    INTEL_I830_IDS(&i830_early_ops),
    INTEL_I845G_IDS(&i845_early_ops),
    @@ -588,6 +589,13 @@ static void __init intel_graphics_quirks
    u16 device;
    int i;

    + /*
    + * Reserve "stolen memory" for an integrated GPU. If we've already
    + * found one, there's nothing to do for other (discrete) GPUs.
    + */
    + if (resource_size(&intel_graphics_stolen_res))
    + return;
    +
    device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);

    for (i = 0; i < ARRAY_SIZE(intel_early_ids); i++) {
    @@ -700,7 +708,7 @@ static struct chipset early_qrk[] __init
    { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST,
    PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
    { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID,
    - QFLAG_APPLY_ONCE, intel_graphics_quirks },
    + 0, intel_graphics_quirks },
    /*
    * HPET on the current version of the Baytrail platform has accuracy
    * problems: it will halt in deep idle state - so we disable it.

    \
     
     \ /
      Last update: 2022-01-24 21:09    [W:3.461 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site