| From bf579becc39ff67c7ce82109da2f881e9944adc8 Mon Sep 17 00:00:00 2001 |
| From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| Date: Thu, 7 Nov 2013 00:22:59 +0100 |
| Subject: 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> |
| (cherry picked from commit 5aac788323dfdd61a6be31734170d644e5d7cb4f) |
| Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| --- |
| drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- 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 dr |
| 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 |
| 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)) |
