Re: [PATCH v2 02/11] drm/i915: Make adjusted_mode.clock non-pixel multiplied

Jani Nikula
2013-09-13T11:38:43Z

On Fri, 06 Sep 2013, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> It would be easier if adjusted_mode.clock would be the pipe pixel clock,
> and it actually is, except for the cases where pixel_multiplier > 1.
>
> So let's change intel_sdvo to use port_clock as the multiplied clock,
> and then we can leave adjusted_mode.clock as pipe pixel clock.
>
> v2: Improve port_clock documentation
> Rebased on top of SDVO pixel_multiplier fixes

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 7 +++----
> drivers/gpu/drm/i915/intel_drv.h | 5 ++++-
> drivers/gpu/drm/i915/intel_sdvo.c | 4 +---
> 3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b45c6e6..2aac205 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -4062,7 +4062,6 @@ retry:
> link_bw = intel_fdi_link_freq(dev) * MHz(100)/KHz(1)/10;
>
> fdi_dotclock = adjusted_mode->clock;
> - fdi_dotclock /= pipe_config->pixel_multiplier;
>
> lane = ironlake_get_lanes_required(fdi_dotclock, link_bw,
> pipe_config->pipe_bpp);
> @@ -7376,8 +7375,7 @@ static void ironlake_crtc_clock_get(struct intel_crtc *crtc,
> clock = ((u64)link_m * (u64)link_freq);
> do_div(clock, link_n);
>
> - pipe_config->adjusted_mode.clock = clock *
> - pipe_config->pixel_multiplier;
> + pipe_config->adjusted_mode.clock = clock;
> }
>
> /** Returns the currently programmed mode of the given pipe. */
> @@ -8322,7 +8320,8 @@ encoder_retry:
> /* Set default port clock if not overwritten by the encoder. Needs to be
> * done afterwards in case the encoder adjusts the mode. */
> if (!pipe_config->port_clock)
> - pipe_config->port_clock = pipe_config->adjusted_mode.clock;
> + pipe_config->port_clock = pipe_config->adjusted_mode.clock *
> + pipe_config->pixel_multiplier;
>
> ret = intel_crtc_compute_config(to_intel_crtc(crtc), pipe_config);
> if (ret < 0) {
> diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
> index ea97c23..dbf04be 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -212,6 +212,8 @@ struct intel_crtc_config {
> unsigned long quirks;
>
> struct drm_display_mode requested_mode;
> + /* Actual pipe timings ie. what we program into the pipe timing
> + * registers. adjusted_mode.clock is the pipe pixel clock. */
> struct drm_display_mode adjusted_mode;
> /* Whether to set up the PCH/FDI. Note that we never allow sharing
> * between pch encoders and cpu encoders. */
> @@ -266,7 +268,8 @@ struct intel_crtc_config {
>
> /*
> * Frequence the dpll for the port should run at. Differs from the
> - * adjusted dotclock e.g. for DP or 12bpc hdmi mode.
> + * adjusted dotclock e.g. for DP or 12bpc hdmi mode. This is also
> + * already multiplied by pixel_multiplier.
> */
> int port_clock;
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
> index 85037b9..74042c6 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -1059,7 +1059,7 @@ intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,
>
> static void i9xx_adjust_sdvo_tv_clock(struct intel_crtc_config *pipe_config)
> {
> - unsigned dotclock = pipe_config->adjusted_mode.clock;
> + unsigned dotclock = pipe_config->port_clock;
> struct dpll *clock = &pipe_config->dpll;
>
> /* SDVO TV has fixed PLL values depend on its clock range,
> @@ -1124,7 +1124,6 @@ static bool intel_sdvo_compute_config(struct intel_encoder *encoder,
> */
> pipe_config->pixel_multiplier =
> intel_sdvo_get_pixel_multiplier(adjusted_mode);
> - adjusted_mode->clock *= pipe_config->pixel_multiplier;
>
> if (intel_sdvo->color_range_auto) {
> /* See CEA-861-E - 5.1 Default Encoding Parameters */
> @@ -1212,7 +1211,6 @@ static void intel_sdvo_mode_set(struct intel_encoder *intel_encoder)
> * adjusted_mode.
> */
> intel_sdvo_get_dtd_from_mode(&input_dtd, adjusted_mode);
> - input_dtd.part1.clock /= crtc->config.pixel_multiplier;
>
> if (intel_sdvo->is_tv || intel_sdvo->is_lvds)
> input_dtd.part2.sdvo_flags = intel_sdvo->dtd_sdvo_flags;
> --
> 1.8.1.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

--
Jani Nikula, Intel Open Source Technology Center