drm/radeon: Poll for both connect/disconnect on analog connectors

[pandora-kernel.git] / drivers / gpu / drm / radeon / radeon_connectors.c

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 6303fc8..40633f3 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1589,7 +1589,6 @@ radeon_add_atom_connector(struct drm_device *dev,
                                                      1);
                        /* no HPD on analog connectors */
                        radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                                                      1);
                        /* no HPD on analog connectors */
                        radeon_connector->hpd.hpd = RADEON_HPD_NONE;

-                       connector->polled = DRM_CONNECTOR_POLL_CONNECT;

                        connector->interlace_allowed = true;
                        connector->doublescan_allowed = true;
                        break;
                        connector->interlace_allowed = true;
                        connector->doublescan_allowed = true;
                        break;


@@ -1787,8 +1786,10 @@ radeon_add_atom_connector(struct drm_device *dev,
        }
 
        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
        }
 
        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {

-               if (i2c_bus->valid)
-                       connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+               if (i2c_bus->valid) {
+                       connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+                                           DRM_CONNECTOR_POLL_DISCONNECT;
+               }

        } else
                connector->polled = DRM_CONNECTOR_POLL_HPD;
 
        } else
                connector->polled = DRM_CONNECTOR_POLL_HPD;
 


@@ -1860,7 +1861,6 @@ radeon_add_legacy_connector(struct drm_device *dev,
                                              1);
                /* no HPD on analog connectors */
                radeon_connector->hpd.hpd = RADEON_HPD_NONE;
                                              1);
                /* no HPD on analog connectors */
                radeon_connector->hpd.hpd = RADEON_HPD_NONE;

-               connector->polled = DRM_CONNECTOR_POLL_CONNECT;

                connector->interlace_allowed = true;
                connector->doublescan_allowed = true;
                break;
                connector->interlace_allowed = true;
                connector->doublescan_allowed = true;
                break;


@@ -1945,10 +1945,13 @@ radeon_add_legacy_connector(struct drm_device *dev,
        }
 
        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {
        }
 
        if (radeon_connector->hpd.hpd == RADEON_HPD_NONE) {

-               if (i2c_bus->valid)
-                       connector->polled = DRM_CONNECTOR_POLL_CONNECT;
+               if (i2c_bus->valid) {
+                       connector->polled = DRM_CONNECTOR_POLL_CONNECT |
+                                           DRM_CONNECTOR_POLL_DISCONNECT;
+               }

        } else
                connector->polled = DRM_CONNECTOR_POLL_HPD;
        } else
                connector->polled = DRM_CONNECTOR_POLL_HPD;

+

        connector->display_info.subpixel_order = subpixel_order;
        drm_sysfs_connector_add(connector);
        if (connector_type == DRM_MODE_CONNECTOR_LVDS) {
        connector->display_info.subpixel_order = subpixel_order;
        drm_sysfs_connector_add(connector);
        if (connector_type == DRM_MODE_CONNECTOR_LVDS) {