drm/i915: Move PLANE_BUG_CFG bit definitions to the correct place

[linux-2.6-block.git] / drivers / gpu / drm / drm_probe_helper.c

diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index bcd9611dabfd96b8586c3aed9ead5141a1daec26..95aeeed33cf57edd8b766c5b2c3b940836ce2ede 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -250,6 +250,12 @@ void drm_kms_helper_poll_enable(struct drm_device *dev)
 
        drm_connector_list_iter_begin(dev, &conn_iter);
        drm_for_each_connector_iter(connector, &conn_iter) {
+               const struct drm_connector_helper_funcs *funcs =
+                       connector->helper_private;
+
+               if (funcs && funcs->enable_hpd)
+                       funcs->enable_hpd(connector);
+
                if (connector->polled & (DRM_CONNECTOR_POLL_CONNECT |
                                         DRM_CONNECTOR_POLL_DISCONNECT))
                        poll = true;
@@ -802,6 +808,30 @@ bool drm_kms_helper_is_poll_worker(void)
 }
 EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
 
+static void drm_kms_helper_poll_disable_fini(struct drm_device *dev, bool fini)
+{
+       struct drm_connector *connector;
+       struct drm_connector_list_iter conn_iter;
+
+       if (!dev->mode_config.poll_enabled)
+               return;
+
+       if (fini)
+               dev->mode_config.poll_enabled = false;
+
+       drm_connector_list_iter_begin(dev, &conn_iter);
+       drm_for_each_connector_iter(connector, &conn_iter) {
+               const struct drm_connector_helper_funcs *funcs =
+                       connector->helper_private;
+
+               if (funcs && funcs->disable_hpd)
+                       funcs->disable_hpd(connector);
+       }
+       drm_connector_list_iter_end(&conn_iter);
+
+       cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+}
+
 /**
  * drm_kms_helper_poll_disable - disable output polling
  * @dev: drm_device
@@ -818,9 +848,7 @@ EXPORT_SYMBOL(drm_kms_helper_is_poll_worker);
  */
 void drm_kms_helper_poll_disable(struct drm_device *dev)
 {
-       if (!dev->mode_config.poll_enabled)
-               return;
-       cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+       drm_kms_helper_poll_disable_fini(dev, false);
 }
 EXPORT_SYMBOL(drm_kms_helper_poll_disable);
 
@@ -858,11 +886,7 @@ EXPORT_SYMBOL(drm_kms_helper_poll_init);
  */
 void drm_kms_helper_poll_fini(struct drm_device *dev)
 {
-       if (!dev->mode_config.poll_enabled)
-               return;
-
-       dev->mode_config.poll_enabled = false;
-       cancel_delayed_work_sync(&dev->mode_config.output_poll_work);
+       drm_kms_helper_poll_disable_fini(dev, true);
 }
 EXPORT_SYMBOL(drm_kms_helper_poll_fini);
 
@@ -1139,10 +1163,94 @@ int drm_connector_helper_get_modes(struct drm_connector *connector)
         * EDID. Otherwise, if the EDID is NULL, clear the connector
         * information.
         */
-       count = drm_edid_connector_update(connector, drm_edid);
+       drm_edid_connector_update(connector, drm_edid);
+
+       count = drm_edid_connector_add_modes(connector);
 
        drm_edid_free(drm_edid);
 
        return count;
 }
 EXPORT_SYMBOL(drm_connector_helper_get_modes);
+
+/**
+ * drm_connector_helper_tv_get_modes - Fills the modes availables to a TV connector
+ * @connector: The connector
+ *
+ * Fills the available modes for a TV connector based on the supported
+ * TV modes, and the default mode expressed by the kernel command line.
+ *
+ * This can be used as the default TV connector helper .get_modes() hook
+ * if the driver does not need any special processing.
+ *
+ * Returns:
+ * The number of modes added to the connector.
+ */
+int drm_connector_helper_tv_get_modes(struct drm_connector *connector)
+{
+       struct drm_device *dev = connector->dev;
+       struct drm_property *tv_mode_property =
+               dev->mode_config.tv_mode_property;
+       struct drm_cmdline_mode *cmdline = &connector->cmdline_mode;
+       unsigned int ntsc_modes = BIT(DRM_MODE_TV_MODE_NTSC) |
+               BIT(DRM_MODE_TV_MODE_NTSC_443) |
+               BIT(DRM_MODE_TV_MODE_NTSC_J) |
+               BIT(DRM_MODE_TV_MODE_PAL_M);
+       unsigned int pal_modes = BIT(DRM_MODE_TV_MODE_PAL) |
+               BIT(DRM_MODE_TV_MODE_PAL_N) |
+               BIT(DRM_MODE_TV_MODE_SECAM);
+       unsigned int tv_modes[2] = { UINT_MAX, UINT_MAX };
+       unsigned int i, supported_tv_modes = 0;
+
+       if (!tv_mode_property)
+               return 0;
+
+       for (i = 0; i < tv_mode_property->num_values; i++)
+               supported_tv_modes |= BIT(tv_mode_property->values[i]);
+
+       if ((supported_tv_modes & ntsc_modes) &&
+           (supported_tv_modes & pal_modes)) {
+               uint64_t default_mode;
+
+               if (drm_object_property_get_default_value(&connector->base,
+                                                         tv_mode_property,
+                                                         &default_mode))
+                       return 0;
+
+               if (cmdline->tv_mode_specified)
+                       default_mode = cmdline->tv_mode;
+
+               if (BIT(default_mode) & ntsc_modes) {
+                       tv_modes[0] = DRM_MODE_TV_MODE_NTSC;
+                       tv_modes[1] = DRM_MODE_TV_MODE_PAL;
+               } else {
+                       tv_modes[0] = DRM_MODE_TV_MODE_PAL;
+                       tv_modes[1] = DRM_MODE_TV_MODE_NTSC;
+               }
+       } else if (supported_tv_modes & ntsc_modes) {
+               tv_modes[0] = DRM_MODE_TV_MODE_NTSC;
+       } else if (supported_tv_modes & pal_modes) {
+               tv_modes[0] = DRM_MODE_TV_MODE_PAL;
+       } else {
+               return 0;
+       }
+
+       for (i = 0; i < ARRAY_SIZE(tv_modes); i++) {
+               struct drm_display_mode *mode;
+
+               if (tv_modes[i] == DRM_MODE_TV_MODE_NTSC)
+                       mode = drm_mode_analog_ntsc_480i(dev);
+               else if (tv_modes[i] == DRM_MODE_TV_MODE_PAL)
+                       mode = drm_mode_analog_pal_576i(dev);
+               else
+                       break;
+               if (!mode)
+                       return i;
+               if (!i)
+                       mode->type |= DRM_MODE_TYPE_PREFERRED;
+               drm_mode_probed_add(connector, mode);
+       }
+
+       return i;
+}
+EXPORT_SYMBOL(drm_connector_helper_tv_get_modes);