drm/i915: Fixup HDMI output on Valleyview

Fixed correct min, max vco limits and dip ctl reg

Signed-off-by: Vijay Purushothaman <[email protected]>
Signed-off-by: Gajanan Bhat <[email protected]>
Signed-off-by: Ben Widawsky <[email protected]>
Reviewed-by: Jesse Barnes <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 0fe4aad8e4245a0e90b7ec676abd529cc65cf760..d17bef7f80405e0e44e917fd7e673c08c8696fe1 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -3683,7 +3683,7 @@
 #define TVIDEO_DIP_DATA(pipe) _PIPE(pipe, _VIDEO_DIP_DATA_A, _VIDEO_DIP_DATA_B)
 #define TVIDEO_DIP_GCP(pipe) _PIPE(pipe, _VIDEO_DIP_GCP_A, _VIDEO_DIP_GCP_B)
 
-#define VLV_VIDEO_DIP_CTL_A            0x60220
+#define VLV_VIDEO_DIP_CTL_A            0x60200
 #define VLV_VIDEO_DIP_DATA_A           0x60208
 #define VLV_VIDEO_DIP_GDCP_PAYLOAD_A   0x60210
 

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e9c1f3c00143abc1bfd8c911d5bfd21e7abc9aed..ed0dcea4a727c9b08ba08b2b4300bc7976bc7d4c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -380,7 +380,7 @@ static const intel_limit_t intel_limits_vlv_dac = {
 
 static const intel_limit_t intel_limits_vlv_hdmi = {
        .dot = { .min = 20000, .max = 165000 },
-       .vco = { .min = 5994000, .max = 4000000 },
+       .vco = { .min = 4000000, .max = 5994000},
        .n = { .min = 1, .max = 7 },
        .m = { .min = 60, .max = 300 }, /* guess */
        .m1 = { .min = 2, .max = 3 },