On Fri, Apr 01, 2016 at 09:48:50PM +0300, ville.syrjala@xxxxxxxxxxxxxxx wrote:
> From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
>
> Eliminate the duplicate code for pipe timing readout in
> intel_crtc_mode_get() by using the functions we use for the normal state
> readout.
I also forgot to point out here that this should fix mode.flags
readout for intel_crtc_mode_get(). Previously it just left tha
t as 0.
>
> v2: Store dotclock in adjusted_mode instead of the final mode
>
> Cc: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Cc: Rob Kramer <rob@xxxxxxxxxxxxxxxxxx>
> Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
> Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_display.c | 22 ++++------------------
> 1 file changed, 4 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index b6f974dd43c9..f42073837204 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -10719,10 +10719,8 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> {
> struct drm_i915_private *dev_priv = dev->dev_private;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> - enum transcoder cpu_transcoder;
> struct drm_display_mode *mode;
> struct intel_crtc_state *pipe_config;
> - u32 htot, hsync, vtot, vsync;
> enum pipe pipe = intel_crtc->pipe;
>
> mode = kzalloc(sizeof(*mode), GFP_KERNEL);
> @@ -10749,24 +10747,12 @@ struct drm_display_mode *intel_crtc_mode_get(struct drm_device *dev,
> pipe_config->dpll_hw_state.fp1 = I915_READ(FP1(pipe));
> i9xx_crtc_clock_get(intel_crtc, pipe_config);
>
> - mode->clock = pipe_config->port_clock / pipe_config->pixel_multiplier;
> -
> - cpu_transcoder = pipe_config->cpu_transcoder;
> - htot = I915_READ(HTOTAL(cpu_transcoder));
> - hsync = I915_READ(HSYNC(cpu_transcoder));
> - vtot = I915_READ(VTOTAL(cpu_transcoder));
> - vsync = I915_READ(VSYNC(cpu_transcoder));
> + pipe_config->base.adjusted_mode.crtc_clock =
> + pipe_config->port_clock / pipe_config->pixel_multiplier;
>
> - mode->hdisplay = (htot & 0xffff) + 1;
> - mode->htotal = ((htot & 0xffff0000) >> 16) + 1;
> - mode->hsync_start = (hsync & 0xffff) + 1;
> - mode->hsync_end = ((hsync & 0xffff0000) >> 16) + 1;
> - mode->vdisplay = (vtot & 0xffff) + 1;
> - mode->vtotal = ((vtot & 0xffff0000) >> 16) + 1;
> - mode->vsync_start = (vsync & 0xffff) + 1;
> - mode->vsync_end = ((vsync & 0xffff0000) >> 16) + 1;
> + intel_get_pipe_timings(intel_crtc, pipe_config);
>
> - drm_mode_set_name(mode);
> + intel_mode_from_pipe_config(mode, pipe_config);
>
> kfree(pipe_config);
>
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
