| From 7cdfa3c8fe839e54d1367589f26f4ae40741844e Mon Sep 17 00:00:00 2001 |
| From: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| Date: Wed, 10 Jul 2013 21:52:19 +0200 |
| Subject: drm/gma500/oak: Use identical generic crtc funcs |
| |
| Use the generic gma functions instead of the oaktrail functions where |
| they are identical. |
| |
| Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| (cherry picked from commit fe5802957f2856b20a408b8933472a27d00e5f77) |
| Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> |
| --- |
| drivers/gpu/drm/gma500/oaktrail_crtc.c | 25 +++---------------------- |
| 1 file changed, 3 insertions(+), 22 deletions(-) |
| |
| --- a/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| +++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c |
| @@ -494,13 +494,6 @@ oaktrail_crtc_mode_set_exit: |
| return 0; |
| } |
| |
| -static bool oaktrail_crtc_mode_fixup(struct drm_crtc *crtc, |
| - const struct drm_display_mode *mode, |
| - struct drm_display_mode *adjusted_mode) |
| -{ |
| - return true; |
| -} |
| - |
| static int oaktrail_pipe_set_base(struct drm_crtc *crtc, |
| int x, int y, struct drm_framebuffer *old_fb) |
| { |
| @@ -563,24 +556,12 @@ pipe_set_base_exit: |
| return ret; |
| } |
| |
| -static void oaktrail_crtc_prepare(struct drm_crtc *crtc) |
| -{ |
| - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; |
| - crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF); |
| -} |
| - |
| -static void oaktrail_crtc_commit(struct drm_crtc *crtc) |
| -{ |
| - struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; |
| - crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON); |
| -} |
| - |
| const struct drm_crtc_helper_funcs oaktrail_helper_funcs = { |
| .dpms = oaktrail_crtc_dpms, |
| - .mode_fixup = oaktrail_crtc_mode_fixup, |
| + .mode_fixup = gma_crtc_mode_fixup, |
| .mode_set = oaktrail_crtc_mode_set, |
| .mode_set_base = oaktrail_pipe_set_base, |
| - .prepare = oaktrail_crtc_prepare, |
| - .commit = oaktrail_crtc_commit, |
| + .prepare = gma_crtc_prepare, |
| + .commit = gma_crtc_commit, |
| }; |
| |