lkml.org 
[lkml]   [2015]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 151/180] apple-gmux: lock iGP IO to protect from vgaarb changes
    Date
    3.16.7-ckt11 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: =?UTF-8?q?Bruno=20Pr=C3=A9mont?= <bonbons@linux-vserver.org>

    commit 4eebd5a4e72697aac25a8a57d3f888a9d5f80370 upstream.

    As GMUX depends on IO for iGP to be enabled and active, lock the IO at
    vgaarb level. This should prevent GPU driver for dGPU to disable IO for
    iGP while it tries to own legacy VGA IO.

    This fixes usage of backlight control combined with closed nvidia
    driver on some Apple dual-GPU (intel/nvidia) systems.

    On those systems loading nvidia driver disables intel IO decoding,
    disabling the gmux backlight controls as a side effect.
    Prior to commits moving boot_vga from (optional) efifb to less optional
    vgaarb this mis-behavior could be avoided by using right kernel config
    (efifb enabled but vgaarb disabled).

    This patch explicitly does not try to trigger vgaarb changes in order
    to avoid confusing already running graphics drivers. If IO has been
    mis-configured by vgaarb gmux will thus fail to probe.
    It is expected to load/probe gmux prior to graphics drivers.

    Fixes: ce027dac592c0ada241ce0f95ae65856828ac450 # nvidia interaction
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=86121
    Reported-by: Petri Hodju <petrihodju@yahoo.com>
    Tested-by: Petri Hodju <petrihodju@yahoo.com>
    Cc: Bjorn Helgaas <bhelgaas@google.com>
    Cc: Matthew Garrett <matthew.garrett@nebula.com>
    Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
    Signed-off-by: Darren Hart <dvhart@linux.intel.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/platform/x86/apple-gmux.c | 48 ++++++++++++++++++++++++++++++++++++++-
    1 file changed, 47 insertions(+), 1 deletion(-)

    diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
    index b9429fbf1cd8..e743b03f50da 100644
    --- a/drivers/platform/x86/apple-gmux.c
    +++ b/drivers/platform/x86/apple-gmux.c
    @@ -22,6 +22,7 @@
    #include <linux/delay.h>
    #include <linux/pci.h>
    #include <linux/vga_switcheroo.h>
    +#include <linux/vgaarb.h>
    #include <acpi/video.h>
    #include <asm/io.h>

    @@ -31,6 +32,7 @@ struct apple_gmux_data {
    bool indexed;
    struct mutex index_lock;

    + struct pci_dev *pdev;
    struct backlight_device *bdev;

    /* switcheroo data */
    @@ -415,6 +417,23 @@ static int gmux_resume(struct device *dev)
    return 0;
    }

    +static struct pci_dev *gmux_get_io_pdev(void)
    +{
    + struct pci_dev *pdev = NULL;
    +
    + while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev))) {
    + u16 cmd;
    +
    + pci_read_config_word(pdev, PCI_COMMAND, &cmd);
    + if (!(cmd & PCI_COMMAND_IO))
    + continue;
    +
    + return pdev;
    + }
    +
    + return NULL;
    +}
    +
    static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
    {
    struct apple_gmux_data *gmux_data;
    @@ -425,6 +444,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
    int ret = -ENXIO;
    acpi_status status;
    unsigned long long gpe;
    + struct pci_dev *pdev = NULL;

    if (apple_gmux_data)
    return -EBUSY;
    @@ -475,7 +495,7 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
    ver_minor = (version >> 16) & 0xff;
    ver_release = (version >> 8) & 0xff;
    } else {
    - pr_info("gmux device not present\n");
    + pr_info("gmux device not present or IO disabled\n");
    ret = -ENODEV;
    goto err_release;
    }
    @@ -483,6 +503,23 @@ static int gmux_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
    pr_info("Found gmux version %d.%d.%d [%s]\n", ver_major, ver_minor,
    ver_release, (gmux_data->indexed ? "indexed" : "classic"));

    + /*
    + * Apple systems with gmux are EFI based and normally don't use
    + * VGA. In addition changing IO+MEM ownership between IGP and dGPU
    + * disables IO/MEM used for backlight control on some systems.
    + * Lock IO+MEM to GPU with active IO to prevent switch.
    + */
    + pdev = gmux_get_io_pdev();
    + if (pdev && vga_tryget(pdev,
    + VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM)) {
    + pr_err("IO+MEM vgaarb-locking for PCI:%s failed\n",
    + pci_name(pdev));
    + ret = -EBUSY;
    + goto err_release;
    + } else if (pdev)
    + pr_info("locked IO for PCI:%s\n", pci_name(pdev));
    + gmux_data->pdev = pdev;
    +
    memset(&props, 0, sizeof(props));
    props.type = BACKLIGHT_PLATFORM;
    props.max_brightness = gmux_read32(gmux_data, GMUX_PORT_MAX_BRIGHTNESS);
    @@ -574,6 +611,10 @@ err_enable_gpe:
    err_notify:
    backlight_device_unregister(bdev);
    err_release:
    + if (gmux_data->pdev)
    + vga_put(gmux_data->pdev,
    + VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM);
    + pci_dev_put(pdev);
    release_region(gmux_data->iostart, gmux_data->iolen);
    err_free:
    kfree(gmux_data);
    @@ -593,6 +634,11 @@ static void gmux_remove(struct pnp_dev *pnp)
    &gmux_notify_handler);
    }

    + if (gmux_data->pdev) {
    + vga_put(gmux_data->pdev,
    + VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM);
    + pci_dev_put(gmux_data->pdev);
    + }
    backlight_device_unregister(gmux_data->bdev);

    release_region(gmux_data->iostart, gmux_data->iolen);

    \
     
     \ /
      Last update: 2015-05-07 12:41    [W:4.154 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site