drm/i915: Rename struct dpll to struct intel_dpll
Subsystems (2)
PATCH 1/1 drm/i915: Rename struct dpll to struct intel_dpll
Prefix struct dpll with intel_ to follow the convention in the driver.
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 76 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 10 ++--- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 7 files changed, 48 insertions(+), 48 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -577,7 +577,7 @@ struct intel_crtc_state;struct intel_initial_plane_config ;struct intel_crtc ;struct intel_limit ; -struct dpll ; +struct intel_dpll ;struct drm_i915_display_funcs {int (*get_display_clock_speed)(struct drm_device *dev);
drivers/gpu/drm/i915/intel_ddi.c +1 -1
@@ -948,7 +948,7 @@ static int bxt_calc_pll_link(struct drm_i915_private *dev_priv, {struct intel_shared_dpll *pll;struct intel_dpll_hw_state *state; -struct dpll clock; +struct intel_dpll clock;/* For DDI ports we always use a shared PLL. */ if (WARN_ON (dpll ==DPLL_ID_PRIVATE ))
drivers/gpu/drm/i915/intel_display.c +38 -38
244 lines not on this page · raw message
drivers/gpu/drm/i915/intel_dp.c +1 -1
@@ -49,7 +49,7 @@struct dp_link_dpll {int clock; -struct dpll dpll; +struct intel_dpll dpll; };static const struct dp_link_dpll gen4_dpll[] = {
drivers/gpu/drm/i915/intel_dpll_mgr.c +1 -1
@@ -1508,7 +1508,7 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,int clock = crtc_state->port_clock;if (encoder->type ==INTEL_OUTPUT_HDMI ) { -struct dpll best_clock; +struct intel_dpll best_clock;/* Calculate HDMI div */ /*
drivers/gpu/drm/i915/intel_drv.h +5 -5
@@ -266,7 +266,7 @@ struct intel_connector {struct intel_dp *mst_port; }; -struct dpll { +struct intel_dpll {/* given values */ int n;int m1, m2;
@@ -484,7 +484,7 @@ struct intel_crtc_state {/* Settings for the intel dpll used on pretty much everything but * haswell. */ -struct dpll dpll; +struct intel_dpll dpll;/* Selected dpll when shared or NULL. */ struct intel_shared_dpll *shared_dpll;
@@ -1206,7 +1206,7 @@ void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv, enum pipe pipe);int vlv_force_pll_on (struct drm_device *dev,enum pipe pipe, -const struct dpll *dpll); +const struct intel_dpll *dpll);void vlv_force_pll_off (struct drm_device *dev,enum pipe pipe);int lpt_get_iclkip (struct drm_i915_private *dev_priv);
@@ -1255,8 +1255,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,void intel_dp_set_m_n (struct intel_crtc *crtc,enum link_m_n_set m_n);int intel_dotclock_calculate (int link_freq,const struct intel_link_m_n *m_n);bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state,int target_clock, -struct dpll *best_clock); -int chv_calc_dpll_params (int refclk,struct dpll *pll_clock); +struct intel_dpll *best_clock); +int chv_calc_dpll_params (int refclk,struct intel_dpll *pll_clock);bool intel_crtc_active (struct drm_crtc *crtc);void hsw_enable_ips (struct intel_crtc *crtc);
drivers/gpu/drm/i915/intel_sdvo.c +1 -1
@@ -1101,7 +1101,7 @@ intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,static void i9xx_adjust_sdvo_tv_clock (struct intel_crtc_state *pipe_config) {unsigned dotclock = pipe_config->port_clock; -struct dpll *clock = &pipe_config->dpll; +struct intel_dpll *clock = &pipe_config->dpll;/* SDVO TV has fixed PLL values depend on its clock range, this mirrors vbios setting. */
Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: Rename struct dpll to struct intel_dpll
== Series Details ==
== Series Details ==
Series: drm/i915: Rename struct dpll to struct intel_dpll
URL : https://patchwork.freedesktop.org/series/7128/
State : failure
== Summary ==
Series 7128v1 drm/i915: Rename struct dpll to struct intel_dpll
http://patchwork.freedesktop.org/api/1.0/series/7128/revisions/1/mbox
Test drv_hangman:
Subgroup error-state-basic:
pass -> FAIL (ro-ilk1-i5-650)
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-cmd:
pass -> FAIL (ro-byt-n2820)
Test kms_flip:
Subgroup basic-flip-vs-wf_vblank:
pass -> FAIL (ro-hsw-i3-4010u)fi-bdw-i7-5557u total:219 pass:206 dwarn:0 dfail:0 fail:0 skip:13 fi-kbl-y total:219 pass:104 dwarn:0 dfail:0 fail:4 skip:111 ro-bdw-i5-5250u total:219 pass:181 dwarn:0 dfail:0 fail:0 skip:38 ro-bdw-i7-5557U total:219 pass:206 dwarn:0 dfail:0 fail:0 skip:13 ro-bdw-i7-5600u total:219 pass:187 dwarn:0 dfail:0 fail:0 skip:32 ro-byt-n2820 total:218 pass:174 dwarn:0 dfail:0 fail:3 skip:41 ro-hsw-i3-4010u total:218 pass:192 dwarn:0 dfail:0 fail:1 skip:25 ro-hsw-i7-4770r total:219 pass:194 dwarn:0 dfail:0 fail:0 skip:25 ro-ilk-i7-620lm total:219 pass:151 dwarn:0 dfail:0 fail:1 skip:67 ro-ilk1-i5-650 total:214 pass:151 dwarn:0 dfail:0 fail:2 skip:61 ro-ivb-i7-3770 total:219 pass:183 dwarn:0 dfail:0 fail:0 skip:36 ro-ivb2-i7-3770 total:219 pass:186 dwarn:0 dfail:0 fail:1 skip:32 ro-skl-i7-6700hq total:214 pass:190 dwarn:0 dfail:0 fail:0 skip:24 ro-snb-i7-2620M total:219 pass:177 dwarn:0 dfail:0 fail:1 skip:41
ro-bsw-n3050 failed to connect after reboot
Results at /archive/results/CI_IGT_test/RO_Patchwork_881/
04a2cc4 drm-intel-nightly: 2016y-05m-13d-08h-36m-15s UTC integration manifest 89383ad drm/i915: Rename struct dpll to struct intel_dpll
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Ander Conselvan de Oliveira
Prefix struct dpll with
intel_to follow the convention in the driver.Cc Ville Syrjälä <[email protected]>Signed-off-by Ander Conselvan de Oliveira <[email protected]>
Not trying to do gcc's job here ;-) Assuming it compiles cleanly:
Quoted 393 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 76 +++++++++++++++++------------------ drivers/gpu/drm/i915/intel_dp.c | 2 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 10 ++--- drivers/gpu/drm/i915/intel_sdvo.c | 2 +- 7 files changed, 48 insertions(+), 48 deletions(-)drivers/gpu/drm/i915/i915_drv.h +1
-1@@ -577,7 +577,7 @@ struct intel_crtc_state;struct intel_initial_plane_config ;struct intel_crtc ;struct intel_limit ; -struct dpll ; +struct intel_dpll ;struct drm_i915_display_funcs {int (*get_display_clock_speed)(struct drm_device *dev);drivers/gpu/drm/i915/intel_ddi.c +1
-1@@ -948,7 +948,7 @@ static int bxt_calc_pll_link(struct drm_i915_private *dev_priv, {struct intel_shared_dpll *pll;struct intel_dpll_hw_state *state; -struct dpll clock; +struct intel_dpll clock;/* For DDI ports we always use a shared PLL. */ if (WARN_ON (dpll ==DPLL_ID_PRIVATE ))drivers/gpu/drm/i915/intel_display.c +38
-38@@ -578,7 +578,7 @@ static bool intel_pipe_will_have_type(const struct intel_crtc_state *crtc_state,* divided-down version of it. */ /* m1 is reserved as 0 in Pineview, n is a ring counter */ -static int pnv_calc_dpll_params (int refclk,struct dpll *clock) +static int pnv_calc_dpll_params (int refclk,struct intel_dpll *clock) { clock->m = clock->m2 +2 ; clock->p = clock->p1 * clock->p2;@@ -590,12 +590,12 @@ static int pnv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot; } -static uint32_t i9xx_dpll_compute_m (struct dpll *dpll) +static uint32_t i9xx_dpll_compute_m (struct intel_dpll *dpll) {return 5 * (dpll->m1 +2 ) + (dpll->m2 +2 ); } -static int i9xx_calc_dpll_params (int refclk,struct dpll *clock) +static int i9xx_calc_dpll_params (int refclk,struct intel_dpll *clock) { clock->m =i9xx_dpll_compute_m (clock); clock->p = clock->p1 * clock->p2;@@ -607,7 +607,7 @@ static int i9xx_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot; } -static int vlv_calc_dpll_params (int refclk,struct dpll *clock) +static int vlv_calc_dpll_params (int refclk,struct intel_dpll *clock) { clock->m = clock->m1 * clock->m2; clock->p = clock->p1 * clock->p2;@@ -619,7 +619,7 @@ static int vlv_calc_dpll_params(int refclk, struct dpll *clock)return clock->dot /5 ; } -int chv_calc_dpll_params (int refclk,struct dpll *clock) +int chv_calc_dpll_params (int refclk,struct intel_dpll *clock) { clock->m = clock->m1 * clock->m2; clock->p = clock->p1 * clock->p2;@@ -640,7 +640,7 @@ int chv_calc_dpll_params(int refclk, struct dpll *clock)static bool intel_PLL_is_valid (struct drm_device *dev,const struct intel_limit *limit, -const struct dpll *clock) +const struct intel_dpll *clock) {if (clock->n < limit->n.min || limit->n.max < clock->n)INTELPllInvalid ("n out of range\n" );@@ -712,11 +712,11 @@ i9xx_select_p2_div(const struct intel_limit *limit,static bool i9xx_find_best_dpll (const struct intel_limit *limit,struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) +int target,int refclk,struct intel_dpll *match_clock, +struct intel_dpll *best_clock) {struct drm_device *dev = crtc_state->base.crtc->dev; -struct dpll clock; +struct intel_dpll clock;int err = target;memset (best_clock,0 ,sizeof (*best_clock));@@ -769,11 +769,11 @@ i9xx_find_best_dpll(const struct intel_limit *limit,static bool pnv_find_best_dpll (const struct intel_limit *limit,struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) +int target,int refclk,struct intel_dpll *match_clock, +struct intel_dpll *best_clock) {struct drm_device *dev = crtc_state->base.crtc->dev; -struct dpll clock; +struct intel_dpll clock;int err = target;memset (best_clock,0 ,sizeof (*best_clock));@@ -824,11 +824,11 @@ pnv_find_best_dpll(const struct intel_limit *limit,static bool g4x_find_best_dpll (const struct intel_limit *limit,struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) +int target,int refclk,struct intel_dpll *match_clock, +struct intel_dpll *best_clock) {struct drm_device *dev = crtc_state->base.crtc->dev; -struct dpll clock; +struct intel_dpll clock;int max_n;bool found = false;/* approximately equals target * 0.00585 */ @@ -874,8 +874,8 @@ g4x_find_best_dpll(const struct intel_limit *limit,* best configuration and error found so far. Return the calculated error. */ static bool vlv_PLL_is_optimal (struct drm_device *dev,int target_freq, -const struct dpll *calculated_clock, -const struct dpll *best_clock, +const struct intel_dpll *calculated_clock, +const struct intel_dpll *best_clock,unsigned int best_error_ppm,unsigned int *error_ppm) {@@ -917,12 +917,12 @@ static bool vlv_PLL_is_optimal(struct drm_device *dev, int target_freq,static bool vlv_find_best_dpll (const struct intel_limit *limit,struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) +int target,int refclk,struct intel_dpll *match_clock, +struct intel_dpll *best_clock) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_device *dev = crtc->base.dev; -struct dpll clock; +struct intel_dpll clock;unsigned int bestppm =1000000 ;/* min update 19.2 MHz */ int max_n =min (limit->n.max, refclk /19200 );@@ -976,13 +976,13 @@ vlv_find_best_dpll(const struct intel_limit *limit,static bool chv_find_best_dpll (const struct intel_limit *limit,struct intel_crtc_state *crtc_state, -int target,int refclk,struct dpll *match_clock, -struct dpll *best_clock) +int target,int refclk,struct intel_dpll *match_clock, +struct intel_dpll *best_clock) {struct intel_crtc *crtc =to_intel_crtc (crtc_state->base.crtc);struct drm_device *dev = crtc->base.dev;unsigned int best_error_ppm; -struct dpll clock; +struct intel_dpll clock;uint64_t m2;int found = false;@@ -1032,7 +1032,7 @@ chv_find_best_dpll(const struct intel_limit *limit, }bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state,int target_clock, -struct dpll *best_clock) +struct intel_dpll *best_clock) {int refclk =100000 ;const struct intel_limit *limit = &intel_limits_bxt;@@ -7041,19 +7041,19 @@ static inline bool intel_panel_use_ssc(struct drm_i915_private *dev_priv) && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); } -static uint32_t pnv_dpll_compute_fp (struct dpll *dpll) +static uint32_t pnv_dpll_compute_fp (struct intel_dpll *dpll) {return (1 << dpll->n) <<16 | dpll->m2; } -static uint32_t i9xx_dpll_compute_fp (struct dpll *dpll) +static uint32_t i9xx_dpll_compute_fp (struct intel_dpll *dpll) {return dpll->n <<16 | dpll->m1 <<8 | dpll->m2; }static void i9xx_update_pll_dividers (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) +struct intel_dpll *reduced_clock) {struct drm_device *dev = crtc->base.dev;u32 fp, fp2 =0 ;@@ -7430,7 +7430,7 @@ static void chv_prepare_pll(struct intel_crtc *crtc,* be enabled. */ int vlv_force_pll_on (struct drm_device *dev,enum pipe pipe, -const struct dpll *dpll) +const struct intel_dpll *dpll) {struct intel_crtc *crtc =to_intel_crtc (intel_get_crtc_for_pipe (dev, pipe));@@ -7477,13 +7477,13 @@ void vlv_force_pll_off(struct drm_device *dev, enum pipe pipe)static void i9xx_compute_dpll (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) +struct intel_dpll *reduced_clock) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 dpll;bool is_sdvo; -struct dpll *clock = &crtc_state->dpll; +struct intel_dpll *clock = &crtc_state->dpll;i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock);@@ -7553,12 +7553,12 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,static void i8xx_compute_dpll (struct intel_crtc *crtc,struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) +struct intel_dpll *reduced_clock) {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;u32 dpll; -struct dpll *clock = &crtc_state->dpll; +struct intel_dpll *clock = &crtc_state->dpll;i9xx_update_pll_dividers (crtc, crtc_state, reduced_clock);@@ -8024,7 +8024,7 @@ static void vlv_crtc_clock_get(struct intel_crtc *crtc,struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private;int pipe = pipe_config->cpu_transcoder; -struct dpll clock; +struct intel_dpll clock;u32 mdiv;int refclk =100000 ;@@ -8121,7 +8121,7 @@ static void chv_crtc_clock_get(struct intel_crtc *crtc,struct drm_i915_private *dev_priv = dev->dev_private;int pipe = pipe_config->cpu_transcoder;enum dpio_channel port =vlv_pipe_to_channel (pipe); -struct dpll clock; +struct intel_dpll clock;u32 cmn_dw13, pll_dw0, pll_dw1, pll_dw2, pll_dw3;int refclk =100000 ;@@ -8777,14 +8777,14 @@ int ironlake_get_lanes_required(int target_clock, int link_bw, int bpp)return DIV_ROUND_UP (bps, link_bw *8 ); } -static bool ironlake_needs_fb_cb_tune (struct dpll *dpll,int factor) +static bool ironlake_needs_fb_cb_tune (struct intel_dpll *dpll,int factor) {return i9xx_dpll_compute_m (dpll) < factor * dpll->n; }static void ironlake_compute_dpll (struct intel_crtc *intel_crtc,struct intel_crtc_state *crtc_state, -struct dpll *reduced_clock) +struct intel_dpll *reduced_clock) {struct drm_crtc *crtc = &intel_crtc->base;struct drm_device *dev = crtc->dev;@@ -8892,7 +8892,7 @@ static int ironlake_crtc_compute_clock(struct intel_crtc *crtc, {struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv = dev->dev_private; -struct dpll reduced_clock; +struct intel_dpll reduced_clock;bool has_reduced_clock = false;struct intel_shared_dpll *pll;const struct intel_limit *limit;@@ -10622,7 +10622,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,int pipe = pipe_config->cpu_transcoder;u32 dpll = pipe_config->dpll_hw_state.dpll;u32 fp; -struct dpll clock; +struct intel_dpll clock;int port_clock;int refclk =i9xx_pll_refclk (dev, pipe_config);drivers/gpu/drm/i915/intel_dp.c +1
-1@@ -49,7 +49,7 @@struct dp_link_dpll {int clock; -struct dpll dpll; +struct intel_dpll dpll; };static const struct dp_link_dpll gen4_dpll[] = {drivers/gpu/drm/i915/intel_dpll_mgr.c +1
-1@@ -1508,7 +1508,7 @@ bxt_get_dpll(struct intel_crtc *crtc, struct intel_crtc_state *crtc_state,int clock = crtc_state->port_clock;if (encoder->type ==INTEL_OUTPUT_HDMI ) { -struct dpll best_clock; +struct intel_dpll best_clock;/* Calculate HDMI div */ /* drivers/gpu/drm/i915/intel_drv.h +5
-5@@ -266,7 +266,7 @@ struct intel_connector {struct intel_dp *mst_port; }; -struct dpll { +struct intel_dpll {/* given values */ int n;int m1, m2;@@ -484,7 +484,7 @@ struct intel_crtc_state {/* Settings for the intel dpll used on pretty much everything but * haswell. */ -struct dpll dpll; +struct intel_dpll dpll;/* Selected dpll when shared or NULL. */ struct intel_shared_dpll *shared_dpll;@@ -1206,7 +1206,7 @@ void assert_pch_transcoder_disabled(struct drm_i915_private *dev_priv, enum pipe pipe);int vlv_force_pll_on (struct drm_device *dev,enum pipe pipe, -const struct dpll *dpll); +const struct intel_dpll *dpll);void vlv_force_pll_off (struct drm_device *dev,enum pipe pipe);int lpt_get_iclkip (struct drm_i915_private *dev_priv);@@ -1255,8 +1255,8 @@ void intel_dp_get_m_n(struct intel_crtc *crtc,void intel_dp_set_m_n (struct intel_crtc *crtc,enum link_m_n_set m_n);int intel_dotclock_calculate (int link_freq,const struct intel_link_m_n *m_n);bool bxt_find_best_dpll (struct intel_crtc_state *crtc_state,int target_clock, -struct dpll *best_clock); -int chv_calc_dpll_params (int refclk,struct dpll *pll_clock); +struct intel_dpll *best_clock); +int chv_calc_dpll_params (int refclk,struct intel_dpll *pll_clock);bool intel_crtc_active (struct drm_crtc *crtc);void hsw_enable_ips (struct intel_crtc *crtc);drivers/gpu/drm/i915/intel_sdvo.c +1
-1@@ -1101,7 +1101,7 @@ intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,static void i9xx_adjust_sdvo_tv_clock (struct intel_crtc_state *pipe_config) {unsigned dotclock = pipe_config->port_clock; -struct dpll *clock = &pipe_config->dpll; +struct intel_dpll *clock = &pipe_config->dpll;/* SDVO TV has fixed PLL values depend on its clock range, this mirrors vbios setting. */ Signature · 6 lines
2.5.5 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx