Merge remote-tracking branch 'drm/drm-next' into drm-misc-next-fixes

Some fixes have been accidentally pushed to this, so I cannot fost-forward.
Required to pull in the remove-fbcon-notifiers fixes.

Signed-off-by: Maarten Lankhorst <[email protected]>

diff --combined drivers/gpu/drm/bridge/ti-tfp410.c
index 07b695172db25c2750294430773dacaeb3aa51fe,bfb21b5eefe151392a04ca2e1f02b08f95e1aa3e..4e76b2b27374fe90a4cb9464ab4febf33dac0e85
--- 1/drivers/gpu/drm/bridge/ti-tfp410.c
--- 2/drivers/gpu/drm/bridge/ti-tfp410.c
+++ b/drivers/gpu/drm/bridge/ti-tfp410.c
@@@ -11,15 -11,15 +11,15 @@@
  #include <linux/delay.h>
  #include <linux/fwnode.h>
  #include <linux/gpio/consumer.h>
+ #include <linux/i2c.h>
  #include <linux/irq.h>
  #include <linux/module.h>
  #include <linux/of_graph.h>
  #include <linux/platform_device.h>
- #include <linux/i2c.h>
  
- #include <drm/drmP.h>
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_crtc.h>
+ #include <drm/drm_print.h>
  #include <drm/drm_probe_helper.h>
  
  #define HOTPLUG_DEBOUNCE_MS           1100
@@@ -70,12 -70,7 +70,12 @@@ static int tfp410_get_modes(struct drm_
  
        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);
@@@ -381,8 -376,7 +381,8 @@@ static int tfp410_fini(struct device *d
  {
        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);