[Intel-gfx] [PATCH] drm/i915: Fix new_config and new_enabled for load detect

[ville . syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

I forgot to set new_config and new_enabled appropriately in the load
detect code. Fix it up.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index dde98020..ec2fc95 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7825,6 +7825,8 @@ bool intel_get_load_detect_pipe(struct drm_connector 
*connector,
        to_intel_connector(connector)->new_encoder = intel_encoder;
 
        intel_crtc = to_intel_crtc(crtc);
+       intel_crtc->new_enabled = true;
+       intel_crtc->new_config = &intel_crtc->config;
        old->dpms_mode = connector->dpms;
        old->load_detect_temp = true;
        old->release_fb = NULL;
@@ -7856,6 +7858,11 @@ bool intel_get_load_detect_pipe(struct drm_connector 
*connector,
                DRM_DEBUG_KMS("failed to set mode on load-detect pipe\n");
                if (old->release_fb)
                        old->release_fb->funcs->destroy(old->release_fb);
+               intel_crtc->new_enabled = crtc->enabled;
+               if (intel_crtc->new_enabled)
+                       intel_crtc->new_config = &intel_crtc->config;
+               else
+                       intel_crtc->new_config = NULL;
                mutex_unlock(&crtc->mutex);
                return false;
        }
@@ -7872,6 +7879,7 @@ void intel_release_load_detect_pipe(struct drm_connector 
*connector,
                intel_attached_encoder(connector);
        struct drm_encoder *encoder = &intel_encoder->base;
        struct drm_crtc *crtc = encoder->crtc;
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
 
        DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
                      connector->base.id, drm_get_connector_name(connector),
@@ -7880,6 +7888,8 @@ void intel_release_load_detect_pipe(struct drm_connector 
*connector,
        if (old->load_detect_temp) {
                to_intel_connector(connector)->new_encoder = NULL;
                intel_encoder->new_crtc = NULL;
+               intel_crtc->new_enabled = false;
+               intel_crtc->new_config = NULL;
                intel_set_mode(crtc, NULL, 0, 0, NULL);
 
                if (old->release_fb) {
-- 
1.8.3.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx