summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi2016-08-22 14:54:30 +0200
committerTomi Valkeinen2017-04-03 11:36:40 +0200
commit4573ebe5ec3121dd4e6f3e8f0c5feba01a235251 (patch)
tree16460c8e69512792b585fcedf9abc843c695b4c5
parentdrm/omap: display: Add displays in sorted order to the panel_list (diff)
downloadkernel-qcow2-linux-4573ebe5ec3121dd4e6f3e8f0c5feba01a235251.tar.gz
kernel-qcow2-linux-4573ebe5ec3121dd4e6f3e8f0c5feba01a235251.tar.xz
kernel-qcow2-linux-4573ebe5ec3121dd4e6f3e8f0c5feba01a235251.zip
drm/omap: poll only connectors where the connect/disconnect can be checked
When the connector associated detect callback is not provided, we can not detect if the display is connected or disconnected. These displays do not support hot plug, they are always connected. Let DRM know that connectors w/o detect callback should not be polled. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--drivers/gpu/drm/omapdrm/omap_connector.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_connector.c b/drivers/gpu/drm/omapdrm/omap_connector.c
index f90e2d22c5ec..50d2b641c28b 100644
--- a/drivers/gpu/drm/omapdrm/omap_connector.c
+++ b/drivers/gpu/drm/omapdrm/omap_connector.c
@@ -229,13 +229,11 @@ struct drm_connector *omap_connector_init(struct drm_device *dev,
connector_type);
drm_connector_helper_add(connector, &omap_connector_helper_funcs);
-#if 0 /* enable when dss2 supports hotplug */
- if (dssdev->caps & OMAP_DSS_DISPLAY_CAP_HPD)
- connector->polled = 0;
- else
-#endif
+ if (dssdev->driver->detect)
connector->polled = DRM_CONNECTOR_POLL_CONNECT |
- DRM_CONNECTOR_POLL_DISCONNECT;
+ DRM_CONNECTOR_POLL_DISCONNECT;
+ else
+ connector->polled = 0;
connector->interlace_allowed = 1;
connector->doublescan_allowed = 0;