aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-07-10 15:52:19 -0400
committerPatrik Jakobsson <patrik.r.jakobsson@gmail.com>2013-07-23 19:47:25 -0400
commitfe5802957f2856b20a408b8933472a27d00e5f77 (patch)
tree04fe2788451ec5a7678deb3a9183596f0f20bfe0 /drivers/gpu
parent42568dd5d3b5bff18d9dbc6f2f2814ed28753ada (diff)
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>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/gma500/oaktrail_crtc.c25
1 files changed, 3 insertions, 22 deletions
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 5cd007e82e59..504ae1117782 100644
--- 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:
494 return 0; 494 return 0;
495} 495}
496 496
497static bool oaktrail_crtc_mode_fixup(struct drm_crtc *crtc,
498 const struct drm_display_mode *mode,
499 struct drm_display_mode *adjusted_mode)
500{
501 return true;
502}
503
504static int oaktrail_pipe_set_base(struct drm_crtc *crtc, 497static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
505 int x, int y, struct drm_framebuffer *old_fb) 498 int x, int y, struct drm_framebuffer *old_fb)
506{ 499{
@@ -563,24 +556,12 @@ pipe_set_base_exit:
563 return ret; 556 return ret;
564} 557}
565 558
566static void oaktrail_crtc_prepare(struct drm_crtc *crtc)
567{
568 struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
569 crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
570}
571
572static void oaktrail_crtc_commit(struct drm_crtc *crtc)
573{
574 struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
575 crtc_funcs->dpms(crtc, DRM_MODE_DPMS_ON);
576}
577
578const struct drm_crtc_helper_funcs oaktrail_helper_funcs = { 559const struct drm_crtc_helper_funcs oaktrail_helper_funcs = {
579 .dpms = oaktrail_crtc_dpms, 560 .dpms = oaktrail_crtc_dpms,
580 .mode_fixup = oaktrail_crtc_mode_fixup, 561 .mode_fixup = gma_crtc_mode_fixup,
581 .mode_set = oaktrail_crtc_mode_set, 562 .mode_set = oaktrail_crtc_mode_set,
582 .mode_set_base = oaktrail_pipe_set_base, 563 .mode_set_base = oaktrail_pipe_set_base,
583 .prepare = oaktrail_crtc_prepare, 564 .prepare = gma_crtc_prepare,
584 .commit = oaktrail_crtc_commit, 565 .commit = gma_crtc_commit,
585}; 566};
586 567