diff options
| author | Ville Syrjälä | 2015-06-24 21:00:06 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-06-29 10:56:03 +0200 |
| commit | 26e1fe4fbd4c15919f8cfa9440d70eca5a457ba3 (patch) | |
| tree | 7585af5e0101c098021354980dc893b0c7dd8232 /drivers/gpu/drm/i915/intel_sprite.c | |
| parent | drm/i915: Compute display FIFO split dynamically for CHV (diff) | |
| download | kernel-qcow2-linux-26e1fe4fbd4c15919f8cfa9440d70eca5a457ba3.tar.gz kernel-qcow2-linux-26e1fe4fbd4c15919f8cfa9440d70eca5a457ba3.tar.xz kernel-qcow2-linux-26e1fe4fbd4c15919f8cfa9440d70eca5a457ba3.zip | |
drm/i915: Use the memory latency based WM computation on VLV too
In order to get decnet memory self refresh residency on VLV, flip it
over to the new CHV way of doing things. VLV doesn't do PM5 or DDR DVFS
so it's a bit simpler.
I'm not sure the currently memory latency used for CHV is really
appropriate for VLV. Some further testing will probably be needed to
figure that out.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Clint Taylor <Clinton.A.Taylor@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 16be667cc5eb..cd21525df352 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c @@ -402,10 +402,6 @@ vlv_update_plane(struct drm_plane *dplane, struct drm_crtc *crtc, if (obj->tiling_mode != I915_TILING_NONE) sprctl |= SP_TILED; - intel_update_sprite_watermarks(dplane, crtc, src_w, src_h, - pixel_size, true, - src_w != crtc_w || src_h != crtc_h); - /* Sizes are 0 based */ src_w--; src_h--; @@ -470,8 +466,6 @@ vlv_disable_plane(struct drm_plane *dplane, struct drm_crtc *crtc) I915_WRITE(SPSURF(pipe, plane), 0); POSTING_READ(SPSURF(pipe, plane)); - - intel_update_sprite_watermarks(dplane, crtc, 0, 0, 0, false, false); } static void |