]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
drm/i915: Fix intel_crtc_mode_get() mode clock
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 23 Sep 2013 14:48:20 +0000 (17:48 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 1 Oct 2013 05:45:12 +0000 (07:45 +0200)
commit773ae0346576a19b6a5e10adb0f63deca603ee00
tree2ca6194f8353eb702250870116bc53edb36d66a4
parent18b5992c37560dffc52b84dec7f83738847cf5c7
drm/i915: Fix intel_crtc_mode_get() mode clock

i9xx_crtc_clock_get() no longer populates adjusted_mode.clock, so we
must get the pixel clock from port_clock in intel_crtc_mode_get().

This bug caused Chris's 845g machine to lockup during boot, and it
was introduced in:

 commit 18442d08786472c63a0a80c27f92b033dffc26de
 Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
 Date:   Fri Sep 13 16:00:08 2013 +0300

    drm/i915: Fix port_clock and adjusted_mode.clock readout all over

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=69713
Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c