[Intel-gfx] [PATCH 1/3] drm/i915: Remove intel_clock_t typedef
Ville Syrjälä
ville.syrjala at linux.intel.com
Wed May 4 09:29:52 UTC 2016
On Wed, May 04, 2016 at 12:11:57PM +0300, Ander Conselvan de Oliveira wrote:
> Just use "struct dpll" everywhere. That's actually shorter than
> intel_clock_t.
I'm thinking we should probably have an intel_ prefix on the thing.
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> ---
> drivers/gpu/drm/i915/intel_ddi.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 62 +++++++++++++++++------------------
> drivers/gpu/drm/i915/intel_dpll_mgr.c | 2 +-
> drivers/gpu/drm/i915/intel_drv.h | 8 ++---
> 4 files changed, 37 insertions(+), 37 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
> index de5fb8c..b302cd1 100644
> --- a/drivers/gpu/drm/i915/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/intel_ddi.c
> @@ -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;
> - intel_clock_t clock;
> + struct dpll clock;
>
> /* For DDI ports we always use a shared PLL. */
> if (WARN_ON(dpll == DPLL_ID_PRIVATE))
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 8262b23..8e41e16 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -582,7 +582,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, intel_clock_t *clock)
> +static int pnv_calc_dpll_params(int refclk, struct dpll *clock)
> {
> clock->m = clock->m2 + 2;
> clock->p = clock->p1 * clock->p2;
> @@ -599,7 +599,7 @@ static uint32_t i9xx_dpll_compute_m(struct dpll *dpll)
> return 5 * (dpll->m1 + 2) + (dpll->m2 + 2);
> }
>
> -static int i9xx_calc_dpll_params(int refclk, intel_clock_t *clock)
> +static int i9xx_calc_dpll_params(int refclk, struct dpll *clock)
> {
> clock->m = i9xx_dpll_compute_m(clock);
> clock->p = clock->p1 * clock->p2;
> @@ -611,7 +611,7 @@ static int i9xx_calc_dpll_params(int refclk, intel_clock_t *clock)
> return clock->dot;
> }
>
> -static int vlv_calc_dpll_params(int refclk, intel_clock_t *clock)
> +static int vlv_calc_dpll_params(int refclk, struct dpll *clock)
> {
> clock->m = clock->m1 * clock->m2;
> clock->p = clock->p1 * clock->p2;
> @@ -623,7 +623,7 @@ static int vlv_calc_dpll_params(int refclk, intel_clock_t *clock)
> return clock->dot / 5;
> }
>
> -int chv_calc_dpll_params(int refclk, intel_clock_t *clock)
> +int chv_calc_dpll_params(int refclk, struct dpll *clock)
> {
> clock->m = clock->m1 * clock->m2;
> clock->p = clock->p1 * clock->p2;
> @@ -644,7 +644,7 @@ int chv_calc_dpll_params(int refclk, intel_clock_t *clock)
>
> static bool intel_PLL_is_valid(struct drm_device *dev,
> const intel_limit_t *limit,
> - const intel_clock_t *clock)
> + const struct dpll *clock)
> {
> if (clock->n < limit->n.min || limit->n.max < clock->n)
> INTELPllInvalid("n out of range\n");
> @@ -716,11 +716,11 @@ i9xx_select_p2_div(const intel_limit_t *limit,
> static bool
> i9xx_find_best_dpll(const intel_limit_t *limit,
> struct intel_crtc_state *crtc_state,
> - int target, int refclk, intel_clock_t *match_clock,
> - intel_clock_t *best_clock)
> + int target, int refclk, struct dpll *match_clock,
> + struct dpll *best_clock)
> {
> struct drm_device *dev = crtc_state->base.crtc->dev;
> - intel_clock_t clock;
> + struct dpll clock;
> int err = target;
>
> memset(best_clock, 0, sizeof(*best_clock));
> @@ -773,11 +773,11 @@ i9xx_find_best_dpll(const intel_limit_t *limit,
> static bool
> pnv_find_best_dpll(const intel_limit_t *limit,
> struct intel_crtc_state *crtc_state,
> - int target, int refclk, intel_clock_t *match_clock,
> - intel_clock_t *best_clock)
> + int target, int refclk, struct dpll *match_clock,
> + struct dpll *best_clock)
> {
> struct drm_device *dev = crtc_state->base.crtc->dev;
> - intel_clock_t clock;
> + struct dpll clock;
> int err = target;
>
> memset(best_clock, 0, sizeof(*best_clock));
> @@ -828,11 +828,11 @@ pnv_find_best_dpll(const intel_limit_t *limit,
> static bool
> g4x_find_best_dpll(const intel_limit_t *limit,
> struct intel_crtc_state *crtc_state,
> - int target, int refclk, intel_clock_t *match_clock,
> - intel_clock_t *best_clock)
> + int target, int refclk, struct dpll *match_clock,
> + struct dpll *best_clock)
> {
> struct drm_device *dev = crtc_state->base.crtc->dev;
> - intel_clock_t clock;
> + struct dpll clock;
> int max_n;
> bool found = false;
> /* approximately equals target * 0.00585 */
> @@ -878,8 +878,8 @@ g4x_find_best_dpll(const intel_limit_t *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 intel_clock_t *calculated_clock,
> - const intel_clock_t *best_clock,
> + const struct dpll *calculated_clock,
> + const struct dpll *best_clock,
> unsigned int best_error_ppm,
> unsigned int *error_ppm)
> {
> @@ -921,12 +921,12 @@ static bool vlv_PLL_is_optimal(struct drm_device *dev, int target_freq,
> static bool
> vlv_find_best_dpll(const intel_limit_t *limit,
> struct intel_crtc_state *crtc_state,
> - int target, int refclk, intel_clock_t *match_clock,
> - intel_clock_t *best_clock)
> + int target, int refclk, struct dpll *match_clock,
> + struct dpll *best_clock)
> {
> struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
> struct drm_device *dev = crtc->base.dev;
> - intel_clock_t clock;
> + struct dpll clock;
> unsigned int bestppm = 1000000;
> /* min update 19.2 MHz */
> int max_n = min(limit->n.max, refclk / 19200);
> @@ -980,13 +980,13 @@ vlv_find_best_dpll(const intel_limit_t *limit,
> static bool
> chv_find_best_dpll(const intel_limit_t *limit,
> struct intel_crtc_state *crtc_state,
> - int target, int refclk, intel_clock_t *match_clock,
> - intel_clock_t *best_clock)
> + int target, int refclk, struct dpll *match_clock,
> + struct 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;
> - intel_clock_t clock;
> + struct dpll clock;
> uint64_t m2;
> int found = false;
>
> @@ -1036,7 +1036,7 @@ chv_find_best_dpll(const intel_limit_t *limit,
> }
>
> bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state, int target_clock,
> - intel_clock_t *best_clock)
> + struct dpll *best_clock)
> {
> int refclk = 100000;
> const intel_limit_t *limit = &intel_limits_bxt;
> @@ -7059,7 +7059,7 @@ static uint32_t i9xx_dpll_compute_fp(struct dpll *dpll)
>
> static void i9xx_update_pll_dividers(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state,
> - intel_clock_t *reduced_clock)
> + struct dpll *reduced_clock)
> {
> struct drm_device *dev = crtc->base.dev;
> u32 fp, fp2 = 0;
> @@ -7483,7 +7483,7 @@ 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,
> - intel_clock_t *reduced_clock)
> + struct dpll *reduced_clock)
> {
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -7559,7 +7559,7 @@ static void i9xx_compute_dpll(struct intel_crtc *crtc,
>
> static void i8xx_compute_dpll(struct intel_crtc *crtc,
> struct intel_crtc_state *crtc_state,
> - intel_clock_t *reduced_clock)
> + struct dpll *reduced_clock)
> {
> struct drm_device *dev = crtc->base.dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> @@ -8030,7 +8030,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;
> - intel_clock_t clock;
> + struct dpll clock;
> u32 mdiv;
> int refclk = 100000;
>
> @@ -8127,7 +8127,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);
> - intel_clock_t clock;
> + struct dpll clock;
> u32 cmn_dw13, pll_dw0, pll_dw1, pll_dw2, pll_dw3;
> int refclk = 100000;
>
> @@ -8790,7 +8790,7 @@ static bool ironlake_needs_fb_cb_tune(struct dpll *dpll, int factor)
>
> static void ironlake_compute_dpll(struct intel_crtc *intel_crtc,
> struct intel_crtc_state *crtc_state,
> - intel_clock_t *reduced_clock)
> + struct dpll *reduced_clock)
> {
> struct drm_crtc *crtc = &intel_crtc->base;
> struct drm_device *dev = crtc->dev;
> @@ -8898,7 +8898,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;
> - intel_clock_t reduced_clock;
> + struct dpll reduced_clock;
> bool has_reduced_clock = false;
> struct intel_shared_dpll *pll;
> const intel_limit_t *limit;
> @@ -10628,7 +10628,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;
> - intel_clock_t clock;
> + struct dpll clock;
> int port_clock;
> int refclk = i9xx_pll_refclk(dev, pipe_config);
>
> diff --git a/drivers/gpu/drm/i915/intel_dpll_mgr.c b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> index 639bf02..b57d7ba 100644
> --- a/drivers/gpu/drm/i915/intel_dpll_mgr.c
> +++ b/drivers/gpu/drm/i915/intel_dpll_mgr.c
> @@ -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) {
> - intel_clock_t best_clock;
> + struct dpll best_clock;
>
> /* Calculate HDMI div */
> /*
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index fcc0643..7cdc1e6 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -265,7 +265,7 @@ struct intel_connector {
> struct intel_dp *mst_port;
> };
>
> -typedef struct dpll {
> +struct dpll {
> /* given values */
> int n;
> int m1, m2;
> @@ -275,7 +275,7 @@ typedef struct dpll {
> int vco;
> int m;
> int p;
> -} intel_clock_t;
> +};
>
> struct intel_atomic_state {
> struct drm_atomic_state base;
> @@ -1250,8 +1250,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,
> - intel_clock_t *best_clock);
> -int chv_calc_dpll_params(int refclk, intel_clock_t *pll_clock);
> + struct dpll *best_clock);
> +int chv_calc_dpll_params(int refclk, struct dpll *pll_clock);
>
> bool intel_crtc_active(struct drm_crtc *crtc);
> void hsw_enable_ips(struct intel_crtc *crtc);
> --
> 2.4.11
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
More information about the Intel-gfx
mailing list