drm/i915: Update intel_logical_ring_begin() to take a request structure

[deliverable/linux.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 3fee587bc284ebffc7b2050c69034cba9c1949da..04203c0d2ecbe0c2a73bc0a5909f9ef85f533baa 100644 (file)
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -98,7 +98,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
 {
        struct drm_device *dev = connector->dev;
        struct drm_display_mode *mode;
-       struct drm_connector_helper_funcs *connector_funcs =
+       const struct drm_connector_helper_funcs *connector_funcs =
                connector->helper_private;
        int count = 0;
        int mode_flags = 0;
@@ -323,8 +323,6 @@ static void output_poll_execute(struct work_struct *work)
                if (!connector->polled || connector->polled == DRM_CONNECTOR_POLL_HPD)
                        continue;
 
-               repoll = true;
-
                old_status = connector->status;
                /* if we are connected and don't want to poll for disconnect
                   skip it */
@@ -332,6 +330,8 @@ static void output_poll_execute(struct work_struct *work)
                    !(connector->polled & DRM_CONNECTOR_POLL_DISCONNECT))
                        continue;
 
+               repoll = true;
+
                connector->status = connector->funcs->detect(connector, false);
                if (old_status != connector->status) {
                        const char *old, *new;