diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-02-20 11:54:17 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-27 09:21:19 -0800 |
| commit | 732b2a1a4bb58677ba9c7be3fac0960ceccc9b8f (patch) | |
| tree | a25c159a031a51e41f43c498dd1e8a07b239c9dd | |
| parent | 53aa75aa360992e07141bbfa2c6062110e678605 (diff) | |
drm/i915: Fix up mismerge of 3490ea5d in 3.7.y
The 3.7.y version of this seems to have missed a hunk in i9xx_update_wm.
Tested-by: Glen Gray <slaine@slaine.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 4e6a2b226278..313088ff3318 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1474,7 +1474,7 @@ static void i9xx_update_wm(struct drm_device *dev) fifo_size = dev_priv->display.get_fifo_size(dev, 0); crtc = intel_get_crtc_for_plane(dev, 0); - if (crtc->enabled && crtc->fb) { + if (intel_crtc_active(crtc)) { planea_wm = intel_calculate_wm(crtc->mode.clock, wm_info, fifo_size, crtc->fb->bits_per_pixel / 8, |