Skip to content

Commit

Permalink
drm/i915: fix i9xx_crtc_clock_get for multiplied pixels
Browse files Browse the repository at this point in the history
The dpll actually runs at the port clock so we don't need
to multiply it again with the pixel multiplier to get the
adjusted_mode.clock. This is in contrast to the ironlake
pixel clock readout code which uses the fdi dotclock: That
one does _not_ run with multiplied pixels.

This issue goes back to the original clock readout code added
in

commit f1f644d
Author: Jesse Barnes <jbarnes@virtuousgeek.org>
Date:   Thu Jun 27 00:39:25 2013 +0300

    drm/i915: get mode clock when reading the pipe config v9

Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Sep 4, 2013
1 parent eeb4793 commit a2dc53e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -7313,8 +7313,7 @@ static void i9xx_crtc_clock_get(struct intel_crtc *crtc,
}
}

pipe_config->adjusted_mode.clock = clock.dot *
pipe_config->pixel_multiplier;
pipe_config->adjusted_mode.clock = clock.dot;
}

static void ironlake_crtc_clock_get(struct intel_crtc *crtc,
Expand Down

0 comments on commit a2dc53e

Please sign in to comment.