Commit 44c15367 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2019-06-27' of...

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: default avatarDave 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
parents f07b56e7 daed277e
...@@ -70,7 +70,12 @@ static int tfp410_get_modes(struct drm_connector *connector) ...@@ -70,7 +70,12 @@ static int tfp410_get_modes(struct drm_connector *connector)
drm_connector_update_edid_property(connector, edid); 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: fallback:
/* No EDID, fallback on the XGA standard modes */ /* No EDID, fallback on the XGA standard modes */
ret = drm_add_modes_noedid(connector, 1920, 1200); ret = drm_add_modes_noedid(connector, 1920, 1200);
...@@ -376,7 +381,8 @@ static int tfp410_fini(struct device *dev) ...@@ -376,7 +381,8 @@ static int tfp410_fini(struct device *dev)
{ {
struct tfp410 *dvi = dev_get_drvdata(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); drm_bridge_remove(&dvi->bridge);
......
...@@ -23,6 +23,7 @@ config VGA_SWITCHEROO ...@@ -23,6 +23,7 @@ config VGA_SWITCHEROO
depends on X86 depends on X86
depends on ACPI depends on ACPI
depends on PCI depends on PCI
depends on (FRAMEBUFFER_CONSOLE=n || FB=y)
select VGA_ARB select VGA_ARB
help help
Many laptops released in 2008/9/10 have two GPUs with a multiplexer Many laptops released in 2008/9/10 have two GPUs with a multiplexer
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment