diff options
| author | Tejun Heo <tj@kernel.org> | 2014-04-25 18:25:55 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-04-25 18:25:55 -0400 |
| commit | 50bce01b0ee34ab9f18a2d5a7467053dda355d30 (patch) | |
| tree | 148739c6b91abdeef3ec8d26b02132e21fb98a6f /drivers/gpu/drm/i915/intel_pm.c | |
| parent | f8f22e53a262ebee37fc98004f16b066cf5bc125 (diff) | |
| parent | 86d56134f1b67d0c18025ba5cade95c048ed528d (diff) | |
| download | op-kernel-dev-50bce01b0ee34ab9f18a2d5a7467053dda355d30.zip op-kernel-dev-50bce01b0ee34ab9f18a2d5a7467053dda355d30.tar.gz | |
Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into for-3.16
Pull in driver-core-next to receive kernfs_notify() updates which will
be used by the planned "cgroup.populated" implementation.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 5874716..19e94c3 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1545,6 +1545,16 @@ static void i9xx_update_wm(struct drm_crtc *unused_crtc) DRM_DEBUG_KMS("FIFO watermarks - A: %d, B: %d\n", planea_wm, planeb_wm); + if (IS_I915GM(dev) && enabled) { + struct intel_framebuffer *fb; + + fb = to_intel_framebuffer(enabled->primary->fb); + + /* self-refresh seems busted with untiled */ + if (fb->obj->tiling_mode == I915_TILING_NONE) + enabled = NULL; + } + /* * Overlay gets an aggressive default since video jitter is bad. */ |
