Commit afe7ef91 authored by Carlos Palminha's avatar Carlos Palminha Committed by Daniel Vetter

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: default avatarCarlos Palminha <palminha@synopsys.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1323963f
...@@ -116,7 +116,7 @@ static const struct gma_limit_t cdv_intel_limits[] = { ...@@ -116,7 +116,7 @@ static const struct gma_limit_t cdv_intel_limits[] = {
.p1 = {.min = 1, .max = 10}, .p1 = {.min = 1, .max = 10},
.p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 10}, .p2 = {.dot_limit = 225000, .p2_slow = 10, .p2_fast = 10},
.find_pll = cdv_intel_find_dp_pll, .find_pll = cdv_intel_find_dp_pll,
} }
}; };
#define _wait_for(COND, MS, W) ({ \ #define _wait_for(COND, MS, W) ({ \
...@@ -245,7 +245,7 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc, ...@@ -245,7 +245,7 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,
/* We don't know what the other fields of these regs are, so /* We don't know what the other fields of these regs are, so
* leave them in place. * leave them in place.
*/ */
/* /*
* The BIT 14:13 of 0x8010/0x8030 is used to select the ref clk * The BIT 14:13 of 0x8010/0x8030 is used to select the ref clk
* for the pipe A/B. Display spec 1.06 has wrong definition. * for the pipe A/B. Display spec 1.06 has wrong definition.
* Correct definition is like below: * Correct definition is like below:
...@@ -256,7 +256,7 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc, ...@@ -256,7 +256,7 @@ cdv_dpll_set_clock_cdv(struct drm_device *dev, struct drm_crtc *crtc,
* *
* if DPLLA sets 01 and DPLLB sets 02, both use clk from DPLLA * if DPLLA sets 01 and DPLLB sets 02, both use clk from DPLLA
* *
*/ */
ret = cdv_sb_read(dev, ref_sfr, &ref_value); ret = cdv_sb_read(dev, ref_sfr, &ref_value);
if (ret) if (ret)
return ret; return ret;
...@@ -646,7 +646,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, ...@@ -646,7 +646,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
* for DP/eDP. When using SSC clock, the ref clk is 100MHz.Otherwise * for DP/eDP. When using SSC clock, the ref clk is 100MHz.Otherwise
* it will be 27MHz. From the VBIOS code it seems that the pipe A choose * it will be 27MHz. From the VBIOS code it seems that the pipe A choose
* 27MHz for DP/eDP while the Pipe B chooses the 100MHz. * 27MHz for DP/eDP while the Pipe B chooses the 100MHz.
*/ */
if (pipe == 0) if (pipe == 0)
refclk = 27000; refclk = 27000;
else else
...@@ -659,7 +659,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, ...@@ -659,7 +659,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
} }
drm_mode_debug_printmodeline(adjusted_mode); drm_mode_debug_printmodeline(adjusted_mode);
limit = gma_crtc->clock_funcs->limit(crtc, refclk); limit = gma_crtc->clock_funcs->limit(crtc, refclk);
ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk, ok = limit->find_pll(limit, crtc, adjusted_mode->clock, refclk,
...@@ -721,7 +721,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc, ...@@ -721,7 +721,7 @@ static int cdv_intel_crtc_mode_set(struct drm_crtc *crtc,
pipeconf |= PIPE_6BPC; pipeconf |= PIPE_6BPC;
} else } else
pipeconf |= PIPE_8BPC; pipeconf |= PIPE_8BPC;
/* Set up the display plane register */ /* Set up the display plane register */
dspcntr = DISPPLANE_GAMMA_ENABLE; dspcntr = DISPPLANE_GAMMA_ENABLE;
...@@ -974,7 +974,6 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev, ...@@ -974,7 +974,6 @@ struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = { const struct drm_crtc_helper_funcs cdv_intel_helper_funcs = {
.dpms = gma_crtc_dpms, .dpms = gma_crtc_dpms,
.mode_fixup = gma_crtc_mode_fixup,
.mode_set = cdv_intel_crtc_mode_set, .mode_set = cdv_intel_crtc_mode_set,
.mode_set_base = gma_pipe_set_base, .mode_set_base = gma_pipe_set_base,
.prepare = gma_crtc_prepare, .prepare = gma_crtc_prepare,
......
...@@ -478,13 +478,6 @@ int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) ...@@ -478,13 +478,6 @@ int gma_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
return 0; return 0;
} }
bool gma_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
return true;
}
void gma_crtc_prepare(struct drm_crtc *crtc) void gma_crtc_prepare(struct drm_crtc *crtc)
{ {
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
......
...@@ -75,9 +75,6 @@ extern void gma_crtc_load_lut(struct drm_crtc *crtc); ...@@ -75,9 +75,6 @@ extern void gma_crtc_load_lut(struct drm_crtc *crtc);
extern void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green, extern void gma_crtc_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
u16 *blue, u32 start, u32 size); u16 *blue, u32 start, u32 size);
extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode); extern void gma_crtc_dpms(struct drm_crtc *crtc, int mode);
extern bool gma_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode);
extern void gma_crtc_prepare(struct drm_crtc *crtc); extern void gma_crtc_prepare(struct drm_crtc *crtc);
extern void gma_crtc_commit(struct drm_crtc *crtc); extern void gma_crtc_commit(struct drm_crtc *crtc);
extern void gma_crtc_disable(struct drm_crtc *crtc); extern void gma_crtc_disable(struct drm_crtc *crtc);
......
...@@ -1026,10 +1026,8 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc, ...@@ -1026,10 +1026,8 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
const struct drm_crtc_helper_funcs mdfld_helper_funcs = { const struct drm_crtc_helper_funcs mdfld_helper_funcs = {
.dpms = mdfld_crtc_dpms, .dpms = mdfld_crtc_dpms,
.mode_fixup = gma_crtc_mode_fixup,
.mode_set = mdfld_crtc_mode_set, .mode_set = mdfld_crtc_mode_set,
.mode_set_base = mdfld__intel_pipe_set_base, .mode_set_base = mdfld__intel_pipe_set_base,
.prepare = gma_crtc_prepare, .prepare = gma_crtc_prepare,
.commit = gma_crtc_commit, .commit = gma_crtc_commit,
}; };
...@@ -657,7 +657,6 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc, ...@@ -657,7 +657,6 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
const struct drm_crtc_helper_funcs oaktrail_helper_funcs = { const struct drm_crtc_helper_funcs oaktrail_helper_funcs = {
.dpms = oaktrail_crtc_dpms, .dpms = oaktrail_crtc_dpms,
.mode_fixup = gma_crtc_mode_fixup,
.mode_set = oaktrail_crtc_mode_set, .mode_set = oaktrail_crtc_mode_set,
.mode_set_base = oaktrail_pipe_set_base, .mode_set_base = oaktrail_pipe_set_base,
.prepare = gma_crtc_prepare, .prepare = gma_crtc_prepare,
......
...@@ -430,7 +430,6 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev, ...@@ -430,7 +430,6 @@ struct drm_display_mode *psb_intel_crtc_mode_get(struct drm_device *dev,
const struct drm_crtc_helper_funcs psb_intel_helper_funcs = { const struct drm_crtc_helper_funcs psb_intel_helper_funcs = {
.dpms = gma_crtc_dpms, .dpms = gma_crtc_dpms,
.mode_fixup = gma_crtc_mode_fixup,
.mode_set = psb_intel_crtc_mode_set, .mode_set = psb_intel_crtc_mode_set,
.mode_set_base = gma_pipe_set_base, .mode_set_base = gma_pipe_set_base,
.prepare = gma_crtc_prepare, .prepare = gma_crtc_prepare,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment