aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/gma500
diff options
context:
space:
mode:
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-11-06 18:22:59 -0500
committerPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-11-08 10:22:11 -0500
commit5aac788323dfdd61a6be31734170d644e5d7cb4f (patch)
treefc3471feda4ec7a2673b91fdc1902d74553fab81 /drivers/gpu/drm/gma500
parentb97b8287a39d1fe6f8aa1b83405f669634ff8401 (diff)
drm/gma500/mrst: Properly route oaktrail hdmi hooks
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>
Diffstat (limited to 'drivers/gpu/drm/gma500')
-rw-r--r--drivers/gpu/drm/gma500/oaktrail_crtc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index ef4f0766a385..25bf206b46f2 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -230,7 +230,7 @@ static void oaktrail_crtc_dpms(struct drm_crtc *crtc, int mode)
230 int i; 230 int i;
231 int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0; 231 int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0;
232 232
233 if (pipe == 1) { 233 if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI)) {
234 oaktrail_crtc_hdmi_dpms(crtc, mode); 234 oaktrail_crtc_hdmi_dpms(crtc, mode);
235 return; 235 return;
236 } 236 }
@@ -387,7 +387,7 @@ static int oaktrail_crtc_mode_set(struct drm_crtc *crtc,
387 int i; 387 int i;
388 int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0; 388 int need_aux = gma_pipe_has_type(crtc, INTEL_OUTPUT_SDVO) ? 1 : 0;
389 389
390 if (pipe == 1) 390 if (gma_pipe_has_type(crtc, INTEL_OUTPUT_HDMI))
391 return oaktrail_crtc_hdmi_mode_set(crtc, mode, adjusted_mode, x, y, old_fb); 391 return oaktrail_crtc_hdmi_mode_set(crtc, mode, adjusted_mode, x, y, old_fb);
392 392
393 if (!gma_power_begin(dev, true)) 393 if (!gma_power_begin(dev, true))