drm/i915: Hook PSR functionality

rodrigovivi · danvet · commit 4906557eb37b · 2013-07-18T10:34:54.000+02:00
PSR must be enabled after transcoder and port are running.
And it is only available for HSW.

v2: move enable/disable to intel_ddi
v3: The spec suggests PSR should be disabled even before backlight (by pzanoni)
v4: also disabling and enabling whenever panel is disabled/enabled.
v5: make it last patch to avoid breaking whenever bisecting. So calling for
    update and force exit came to this patch along with enable/disable calls.
v6: Remove unused and unecessary psr_enable/disable calls, as notice by Paulo.

CC: Paulo Zanoni &lt;paulo.r.zanoni@intel.com&gt;
Signed-off-by: Rodrigo Vivi &lt;rodrigo.vivi@gmail.com&gt;
[danvet: Drop the psr exit code in the busy ioctl since I didn't merge
that part of the infrastructure yet - it needs more thought.]
Signed-off-by: Daniel Vetter &lt;daniel.vetter@ffwll.ch&gt;
diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
@@ -1117,6 +1117,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)
 			intel_dp_stop_link_train(intel_dp);
 
 		ironlake_edp_backlight_on(intel_dp);
+		intel_edp_psr_enable(intel_dp);
 	}
 
 	if (intel_crtc->eld_vld && type != INTEL_OUTPUT_EDP) {
@@ -1147,6 +1148,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)
 	if (type == INTEL_OUTPUT_EDP) {
 		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
 
+		intel_edp_psr_disable(intel_dp);
 		ironlake_edp_backlight_off(intel_dp);
 	}
 }
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
@@ -2274,6 +2274,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
 	}
 
 	intel_update_fbc(dev);
+	intel_edp_psr_update(dev);
 	mutex_unlock(&dev->struct_mutex);
 
 	intel_crtc_update_sarea_pos(crtc, x, y);

Original file line number	Diff line number	Diff line change
`@@ -1117,6 +1117,7 @@ static void intel_enable_ddi(struct intel_encoder *intel_encoder)`
`1117`	`1117`	`intel_dp_stop_link_train(intel_dp);`
`1118`	`1118`
`1119`	`1119`	`ironlake_edp_backlight_on(intel_dp);`
	`1120`	`+ intel_edp_psr_enable(intel_dp);`
`1120`	`1121`	`}`
`1121`	`1122`
`1122`	`1123`	`if (intel_crtc->eld_vld && type != INTEL_OUTPUT_EDP) {`
`@@ -1147,6 +1148,7 @@ static void intel_disable_ddi(struct intel_encoder *intel_encoder)`
`1147`	`1148`	`if (type == INTEL_OUTPUT_EDP) {`
`1148`	`1149`	`struct intel_dp *intel_dp = enc_to_intel_dp(encoder);`
`1149`	`1150`
	`1151`	`+ intel_edp_psr_disable(intel_dp);`
`1150`	`1152`	`ironlake_edp_backlight_off(intel_dp);`
`1151`	`1153`	`}`
`1152`	`1154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2274,6 +2274,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,`
`2274`	`2274`	`}`
`2275`	`2275`
`2276`	`2276`	`intel_update_fbc(dev);`
	`2277`	`+ intel_edp_psr_update(dev);`
`2277`	`2278`	`mutex_unlock(&dev->struct_mutex);`
`2278`	`2279`
`2279`	`2280`	`intel_crtc_update_sarea_pos(crtc, x, y);`