drm/gma500/mrst: Properly route oaktrail hdmi hooks
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Wed, 6 Nov 2013 23:22:59 +0000 (00:22 +0100)
committerPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Fri, 8 Nov 2013 15:22:11 +0000 (16:22 +0100)
Since we can have SDVO on Pipe B we better check the output type instead
of pipe number for Oaktrail HDMI.

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
drivers/gpu/drm/gma500/oaktrail_crtc.c

index ef4f076..25bf206 100644 (file)
@@ -230,7 +230,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
        int i;
        int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0;
 
-       if (pipe == 1) {
+       if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
                oaktrail_crtc_hdmi_dpms(crtc, mode);
                return;
        }
@@ -387,7 +387,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
        int i;
        int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0;
 
-       if (pipe == 1)
+       if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI))
                return oaktrail_crtc_hdmi_mode_set(crtc, mode, adjusted_mode, x, y, old_fb);
 
        if (!gma_power_begin(dev, true))