diff options
| author | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-11-07 00:22:59 +0100 |
|---|---|---|
| committer | Patrik Jakobsson <patrik.r.jakobsson@gmail.com> | 2013-11-08 16:22:11 +0100 |
| commit | 5aac788323dfdd61a6be31734170d644e5d7cb4f (patch) | |
| tree | fc3471feda4ec7a2673b91fdc1902d74553fab81 | |
| parent | b97b8287a39d1fe6f8aa1b83405f669634ff8401 (diff) | |
| download | op-kernel-dev-5aac788323dfdd61a6be31734170d644e5d7cb4f.zip op-kernel-dev-5aac788323dfdd61a6be31734170d644e5d7cb4f.tar.gz | |
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>
| -rw-r--r-- | drivers/gpu/drm/gma500/oaktrail_crtc.c | 4 |
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 ef4f076..25bf206 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) 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)) |
