diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-04 14:19:40 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-04 14:20:40 +1000 |
| commit | 44c153671296ecdee7c75aaf778f054ffaf1ee00 (patch) | |
| tree | 98d87d631c2910e98b78997f7a57639dea9f971d | |
| parent | f07b56e7d0b21b49d809b301837c6ba39c27309a (diff) | |
| parent | daed277e4d5ace0883d30b9be245d35c46289f49 (diff) | |
| download | linux-44c153671296ecdee7c75aaf778f054ffaf1ee00.tar.gz linux-44c153671296ecdee7c75aaf778f054ffaf1ee00.tar.bz2 linux-44c153671296ecdee7c75aaf778f054ffaf1ee00.zip | |
Merge tag 'drm-misc-next-fixes-2019-06-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next-fixes for v5.3:
- Fixes to the tfp410 bridge.
- Small build fix for vga_switcheroo to prevent building against modular fbcon.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20a62234-bc27-00eb-e0e2-22b55eec1cb2@linux.intel.com
| -rw-r--r-- | drivers/gpu/drm/bridge/ti-tfp410.c | 10 | ||||
| -rw-r--r-- | drivers/gpu/vga/Kconfig | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/ti-tfp410.c b/drivers/gpu/drm/bridge/ti-tfp410.c index bfb21b5eefe1..4e76b2b27374 100644 --- a/drivers/gpu/drm/bridge/ti-tfp410.c +++ b/drivers/gpu/drm/bridge/ti-tfp410.c @@ -70,7 +70,12 @@ static int tfp410_get_modes(struct drm_connector *connector) drm_connector_update_edid_property(connector, edid); - return drm_add_edid_modes(connector, edid); + ret = drm_add_edid_modes(connector, edid); + + kfree(edid); + + return ret; + fallback: /* No EDID, fallback on the XGA standard modes */ ret = drm_add_modes_noedid(connector, 1920, 1200); @@ -376,7 +381,8 @@ static int tfp410_fini(struct device *dev) { struct tfp410 *dvi = dev_get_drvdata(dev); - cancel_delayed_work_sync(&dvi->hpd_work); + if (dvi->hpd_irq >= 0) + cancel_delayed_work_sync(&dvi->hpd_work); drm_bridge_remove(&dvi->bridge); diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig index 84ab482d0db6..c8c770b05ed9 100644 --- a/drivers/gpu/vga/Kconfig +++ b/drivers/gpu/vga/Kconfig @@ -23,6 +23,7 @@ config VGA_SWITCHEROO depends on X86 depends on ACPI depends on PCI + depends on (FRAMEBUFFER_CONSOLE=n || FB=y) select VGA_ARB help Many laptops released in 2008/9/10 have two GPUs with a multiplexer |