drm/i915: Do not read non-existent DPLL registers on PCH hardware
We only execute intel_decrease_pllclock for pre-PCH hardware, typically gen4 mobiles. However, in the variable declaration we did read from the non-PCH DPLL register, quite naughty and detected by SandyBridge. Reported-and-tested-by: Andrey Rahmatullin <wrar@wrar.name> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=49025 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Родитель
69964ea4c7
Коммит
074b5e1a99
|
@ -7072,9 +7072,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
|
||||||
struct drm_device *dev = crtc->dev;
|
struct drm_device *dev = crtc->dev;
|
||||||
drm_i915_private_t *dev_priv = dev->dev_private;
|
drm_i915_private_t *dev_priv = dev->dev_private;
|
||||||
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
|
||||||
int pipe = intel_crtc->pipe;
|
|
||||||
int dpll_reg = DPLL(pipe);
|
|
||||||
int dpll = I915_READ(dpll_reg);
|
|
||||||
|
|
||||||
if (HAS_PCH_SPLIT(dev))
|
if (HAS_PCH_SPLIT(dev))
|
||||||
return;
|
return;
|
||||||
|
@ -7087,10 +7084,15 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
|
||||||
* the manual case.
|
* the manual case.
|
||||||
*/
|
*/
|
||||||
if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
|
if (!HAS_PIPE_CXSR(dev) && intel_crtc->lowfreq_avail) {
|
||||||
|
int pipe = intel_crtc->pipe;
|
||||||
|
int dpll_reg = DPLL(pipe);
|
||||||
|
u32 dpll;
|
||||||
|
|
||||||
DRM_DEBUG_DRIVER("downclocking LVDS\n");
|
DRM_DEBUG_DRIVER("downclocking LVDS\n");
|
||||||
|
|
||||||
assert_panel_unlocked(dev_priv, pipe);
|
assert_panel_unlocked(dev_priv, pipe);
|
||||||
|
|
||||||
|
dpll = I915_READ(dpll_reg);
|
||||||
dpll |= DISPLAY_RATE_SELECT_FPA1;
|
dpll |= DISPLAY_RATE_SELECT_FPA1;
|
||||||
I915_WRITE(dpll_reg, dpll);
|
I915_WRITE(dpll_reg, dpll);
|
||||||
intel_wait_for_vblank(dev, pipe);
|
intel_wait_for_vblank(dev, pipe);
|
||||||
|
@ -7098,7 +7100,6 @@ static void intel_decrease_pllclock(struct drm_crtc *crtc)
|
||||||
if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
|
if (!(dpll & DISPLAY_RATE_SELECT_FPA1))
|
||||||
DRM_DEBUG_DRIVER("failed to downclock LVDS!\n");
|
DRM_DEBUG_DRIVER("failed to downclock LVDS!\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Загрузка…
Ссылка в новой задаче