[Intel-gfx] [PATCH 04/13] drm/i915: split aux_clock_divider logic in a separated function for reuse.

[Paulo Zanoni]

2013/6/12 Rodrigo Vivi <rodrigo.vivi at gmail.com>:
> Prep patch for reuse aux_clock_divider with EDP_PSR_AUX_CTL setup.
>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>

I've seen this patch on this mailing list a few times already, and
it's just a prep-work for PSR, so I guess we could merge it now so we
spare Rodrigo the pain of rebasing it again and again. And I like tiny
functions like these, even if they have just 1 caller.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni at intel.com>

> ---
>  drivers/gpu/drm/i915/intel_dp.c | 58 +++++++++++++++++++++++------------------
>  1 file changed, 33 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
> index 5332186..02b2865 100644
> --- a/drivers/gpu/drm/i915/intel_dp.c
> +++ b/drivers/gpu/drm/i915/intel_dp.c
> @@ -271,29 +271,12 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)
>         return status;
>  }
>
> -static int
> -intel_dp_aux_ch(struct intel_dp *intel_dp,
> -               uint8_t *send, int send_bytes,
> -               uint8_t *recv, int recv_size)
> +static uint32_t get_aux_clock_divider(struct intel_dp *intel_dp)
>  {
>         struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
>         struct drm_device *dev = intel_dig_port->base.base.dev;
>         struct drm_i915_private *dev_priv = dev->dev_private;
> -       uint32_t ch_ctl = intel_dp->aux_ch_ctl_reg;
> -       uint32_t ch_data = ch_ctl + 4;
> -       int i, ret, recv_bytes;
> -       uint32_t status;
> -       uint32_t aux_clock_divider;
> -       int try, precharge;
> -       bool has_aux_irq = INTEL_INFO(dev)->gen >= 5 && !IS_VALLEYVIEW(dev);
>
> -       /* dp aux is extremely sensitive to irq latency, hence request the
> -        * lowest possible wakeup latency and so prevent the cpu from going into
> -        * deep sleep states.
> -        */
> -       pm_qos_update_request(&dev_priv->pm_qos, 0);
> -
> -       intel_dp_check_edp(intel_dp);
>         /* The clock divider is based off the hrawclk,
>          * and would like to run at 2MHz. So, take the
>          * hrawclk value and divide by 2 and use that
> @@ -302,23 +285,48 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
>          * clock divider.
>          */
>         if (IS_VALLEYVIEW(dev)) {
> -               aux_clock_divider = 100;
> +               return 100;
>         } else if (intel_dig_port->port == PORT_A) {
>                 if (HAS_DDI(dev))
> -                       aux_clock_divider = DIV_ROUND_CLOSEST(
> +                       return DIV_ROUND_CLOSEST(
>                                 intel_ddi_get_cdclk_freq(dev_priv), 2000);
>                 else if (IS_GEN6(dev) || IS_GEN7(dev))
> -                       aux_clock_divider = 200; /* SNB & IVB eDP input clock at 400Mhz */
> +                       return 200; /* SNB & IVB eDP input clock at 400Mhz */
>                 else
> -                       aux_clock_divider = 225; /* eDP input clock at 450Mhz */
> +                       return 225; /* eDP input clock at 450Mhz */
>         } else if (dev_priv->pch_id == INTEL_PCH_LPT_DEVICE_ID_TYPE) {
>                 /* Workaround for non-ULT HSW */
> -               aux_clock_divider = 74;
> +               return 74;
>         } else if (HAS_PCH_SPLIT(dev)) {
> -               aux_clock_divider = DIV_ROUND_UP(intel_pch_rawclk(dev), 2);
> +               return DIV_ROUND_UP(intel_pch_rawclk(dev), 2);
>         } else {
> -               aux_clock_divider = intel_hrawclk(dev) / 2;
> +               return intel_hrawclk(dev) / 2;
>         }
> +}
> +
> +static int
> +intel_dp_aux_ch(struct intel_dp *intel_dp,
> +               uint8_t *send, int send_bytes,
> +               uint8_t *recv, int recv_size)
> +{
> +       struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);
> +       struct drm_device *dev = intel_dig_port->base.base.dev;
> +       struct drm_i915_private *dev_priv = dev->dev_private;
> +       uint32_t ch_ctl = intel_dp->aux_ch_ctl_reg;
> +       uint32_t ch_data = ch_ctl + 4;
> +       int i, ret, recv_bytes;
> +       uint32_t status;
> +       uint32_t aux_clock_divider = get_aux_clock_divider(intel_dp);
> +       int try, precharge;
> +       bool has_aux_irq = INTEL_INFO(dev)->gen >= 5 && !IS_VALLEYVIEW(dev);
> +
> +       /* dp aux is extremely sensitive to irq latency, hence request the
> +        * lowest possible wakeup latency and so prevent the cpu from going into
> +        * deep sleep states.
> +        */
> +       pm_qos_update_request(&dev_priv->pm_qos, 0);
> +
> +       intel_dp_check_edp(intel_dp);
>
>         if (IS_GEN6(dev))
>                 precharge = 3;
> --
> 1.7.11.7
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Paulo Zanoni