Merge branch 'peter/ti-linux-4.4.y/topic/display' of https://github.com/omap-audio/linux-audio into audio-display-ti-linux-4.4.y

First batch of display and backlight fixes for 2016.04

* 'peter/ti-linux-4.4.y/topic/display' of https://github.com/omap-audio/linux-audio:
  drm: drm_probe_helper: Fix output_poll_work scheduling
  drm/omap: Create fbdev emulation only for the first DRM connector
  drm/omap: display: Add displays in sorted order to the panel_list
  backlight: led_bl: Omit error message if parse_dt returns with -EPROBE_DEFER

Author: Jyri Sarha

drivers/gpu/drm/drm_probe_helper.c

@@ -109,6 +109,7 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev)
 {
 	bool poll = false;
 	struct drm_connector *connector;
+	unsigned long delay = DRM_OUTPUT_POLL_PERIOD;
 
 	WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
 
@@ -121,8 +122,13 @@ void drm_kms_helper_poll_enable_locked(struct drm_device *dev)
 			poll = true;
 	}
 
+	if (dev->mode_config.delayed_event) {
+		poll = true;
+		delay = 0;
+	}
+
 	if (poll)
-		schedule_delayed_work(&dev->mode_config.output_poll_work, DRM_OUTPUT_POLL_PERIOD);
+		schedule_delayed_work(&dev->mode_config.output_poll_work, delay);
 }
 EXPORT_SYMBOL(drm_kms_helper_poll_enable_locked);
 

drivers/gpu/drm/omapdrm/dss/display.c

@@ -83,6 +83,7 @@ static int disp_num_counter;
 int omapdss_register_display(struct omap_dss_device *dssdev)
 {
 	struct omap_dss_driver *drv = dssdev->driver;
+	struct list_head *cur;
 	int id;
 
 	/*
@@ -118,7 +119,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
 		drv->get_timings = omapdss_default_get_timings;
 
 	mutex_lock(&panel_list_mutex);
-	list_add_tail(&dssdev->panel_list, &panel_list);
+	list_for_each(cur, &panel_list) {
+		struct omap_dss_device *ldev = list_entry(cur,
+							 struct omap_dss_device,
+							 panel_list);
+		if (strcmp(ldev->alias, dssdev->alias) > 0)
+			break;
+	}
+	list_add_tail(&dssdev->panel_list, cur);
 	mutex_unlock(&panel_list_mutex);
 	return 0;
 }

drivers/gpu/drm/omapdrm/omap_fbdev.c

@@ -280,7 +280,9 @@ struct drm_fb_helper *omap_fbdev_init(struct drm_device *dev)
 		goto fail;
 	}
 
-	ret = drm_fb_helper_single_add_all_connectors(helper);
+	drm_modeset_lock_all(dev);
+	ret = drm_fb_helper_add_one_connector(helper, priv->connectors[0]);
+	drm_modeset_unlock_all(dev);
 	if (ret)
 		goto fini;
 

drivers/video/backlight/led_bl.c

@@ -149,7 +149,8 @@ static int led_bl_probe(struct platform_device *pdev)
 
 	ret = led_bl_parse_dt(&pdev->dev, priv);
 	if (ret < 0) {
-		dev_err(&pdev->dev, "failed to parse DT data\n");
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "failed to parse DT data\n");
 		return ret;
 	}