Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/gma: removed optional dummy crtc mode_fixup function.

This patch set nukes all the dummy crtc mode_fixup implementations.
(made on top of Daniel topic/drm-misc branch)

Signed-off-by: Carlos Palminha <palminha@synopsys.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

authored by

Carlos Palminha and committed by
Daniel Vetter
afe7ef91 1323963f

+6 -21
+6 -7
drivers/gpu/drm/gma500/cdv_intel_display.c
··· 116 116 .p1 = {.min = 1, .max = 10}, 117 117 .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 10}, 118 118 .find_pll = cdv_intel_find_dp_pll, 119 - } 119 + } 120 120 }; 121 121 122 122 #define _wait_for(COND, MS, W) ({ \ ··· 245 245 /* We don't know what the other fields of these regs are, so 246 246 * leave them in place. 247 247 */ 248 - /* 248 + /* 249 249 * The BIT 14:13 of 0x8010/0x8030 is used to select the ref clk 250 250 * for the pipe A/B. Display spec 1.06 has wrong definition. 251 251 * Correct definition is like below: ··· 256 256 * 257 257 * if DPLLA sets 01 and DPLLB sets 02, both use clk from DPLLA 258 258 * 259 - */ 259 + */ 260 260 ret = cdv_sb_read(dev, ref_sfr, &ref_value); 261 261 if (ret) 262 262 return ret; ··· 646 646 * for DP/eDP. When using SSC clock, the ref clk is 100MHz.Otherwise 647 647 * it will be 27MHz. From the VBIOS code it seems that the pipe A choose 648 648 * 27MHz for DP/eDP while the Pipe B chooses the 100MHz. 649 - */ 649 + */ 650 650 if (pipe == 0) 651 651 refclk = 27000; 652 652 else ··· 659 659 } 660 660 661 661 drm_mode_debug_printmodeline(adjusted_mode); 662 - 662 + 663 663 limit = gma_crtc->clock_funcs->limit(crtc, refclk); 664 664 665 665 ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk, ··· 721 721 pipeconf |= PIPE_6BPC; 722 722 } else 723 723 pipeconf |= PIPE_8BPC; 724 - 724 + 725 725 /* Set up the display plane register */ 726 726 dspcntr = DISPPLANE_GAMMA_ENABLE; 727 727 ··· 974 974 975 975 const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { 976 976 .dpms = gma_crtc_dpms, 977 - .mode_fixup = gma_crtc_mode_fixup, 978 977 .mode_set = cdv_intel_crtc_mode_set, 979 978 .mode_set_base = gma_pipe_set_base, 980 979 .prepare = gma_crtc_prepare,
-7
drivers/gpu/drm/gma500/gma_display.c
··· 478 478 return 0; 479 479 } 480 480 481 - bool gma_crtc_mode_fixup(struct drm_crtc *crtc, 482 - const struct drm_display_mode *mode, 483 - struct drm_display_mode *adjusted_mode) 484 - { 485 - return true; 486 - } 487 - 488 481 void gma_crtc_prepare(struct drm_crtc *crtc) 489 482 { 490 483 const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
-3
drivers/gpu/drm/gma500/gma_display.h
··· 75 75 extern void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, 76 76 u16 *blue, u32 start, u32 size); 77 77 extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode); 78 - extern bool gma_crtc_mode_fixup(struct drm_crtc *crtc, 79 - const struct drm_display_mode *mode, 80 - struct drm_display_mode *adjusted_mode); 81 78 extern void gma_crtc_prepare(struct drm_crtc *crtc); 82 79 extern void gma_crtc_commit(struct drm_crtc *crtc); 83 80 extern void gma_crtc_disable(struct drm_crtc *crtc);
-2
drivers/gpu/drm/gma500/mdfld_intel_display.c
··· 1026 1026 1027 1027 const struct drm_crtc_helper_funcs mdfld_helper_funcs = { 1028 1028 .dpms = mdfld_crtc_dpms, 1029 - .mode_fixup = gma_crtc_mode_fixup, 1030 1029 .mode_set = mdfld_crtc_mode_set, 1031 1030 .mode_set_base = mdfld__intel_pipe_set_base, 1032 1031 .prepare = gma_crtc_prepare, 1033 1032 .commit = gma_crtc_commit, 1034 1033 }; 1035 -
-1
drivers/gpu/drm/gma500/oaktrail_crtc.c
··· 657 657 658 658 const struct drm_crtc_helper_funcs oaktrail_helper_funcs = { 659 659 .dpms = oaktrail_crtc_dpms, 660 - .mode_fixup = gma_crtc_mode_fixup, 661 660 .mode_set = oaktrail_crtc_mode_set, 662 661 .mode_set_base = oaktrail_pipe_set_base, 663 662 .prepare = gma_crtc_prepare,
-1
drivers/gpu/drm/gma500/psb_intel_display.c
··· 430 430 431 431 const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { 432 432 .dpms = gma_crtc_dpms, 433 - .mode_fixup = gma_crtc_mode_fixup, 434 433 .mode_set = psb_intel_crtc_mode_set, 435 434 .mode_set_base = gma_pipe_set_base, 436 435 .prepare = gma_crtc_prepare,