diff options
author | Gustavo Padovan | 2018-06-20 18:22:22 +0200 |
---|---|---|
committer | Gustavo Padovan | 2018-06-20 18:22:22 +0200 |
commit | d98c71dadc2d0debdb80beb5a478baf1e6f98758 (patch) | |
tree | bf873c28d3acced1814f8b2dba4ae69d2ed77333 /drivers/gpu/drm/bridge | |
parent | drm: writeback: Add client capability for exposing writeback connectors (diff) | |
parent | Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
download | kernel-qcow2-linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.tar.gz kernel-qcow2-linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.tar.xz kernel-qcow2-linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.zip |
Merge drm-upstream/drm-next into drm-misc-next
We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'drivers/gpu/drm/bridge')
-rw-r--r-- | drivers/gpu/drm/bridge/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/dumb-vga-dac.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 5cc4a51e1e92..bf6cad6c9178 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -84,6 +84,7 @@ config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF select DRM_KMS_HELPER + imply EXTCON select INPUT select RC_CORE help diff --git a/drivers/gpu/drm/bridge/dumb-vga-dac.c b/drivers/gpu/drm/bridge/dumb-vga-dac.c index 498d5948d1a8..9837c8d69e69 100644 --- a/drivers/gpu/drm/bridge/dumb-vga-dac.c +++ b/drivers/gpu/drm/bridge/dumb-vga-dac.c @@ -56,7 +56,9 @@ static int dumb_vga_get_modes(struct drm_connector *connector) } drm_mode_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: /* |