diff options
| author | Ville Syrjälä | 2016-11-28 18:37:06 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2016-12-05 15:23:25 +0100 |
| commit | 50a9dd3f24e1478ce143bf2876b0680f2038c503 (patch) | |
| tree | c3e8a15ec2c6c990e863fa17e1ad4851f648c849 /drivers/gpu/drm/i915/intel_pm.c | |
| parent | drm/i915: Fix the level 0 max_wm hack on VLV/CHV (diff) | |
| download | kernel-qcow2-linux-50a9dd3f24e1478ce143bf2876b0680f2038c503.tar.gz kernel-qcow2-linux-50a9dd3f24e1478ce143bf2876b0680f2038c503.tar.xz kernel-qcow2-linux-50a9dd3f24e1478ce143bf2876b0680f2038c503.zip | |
drm/i915: Clean up VLV/CHV maxfifo watermark setup
Let's compute the maxfifo watermarks using max() instead of min().
Can't even recall why I did it the other way originally. Anyways
using max() avoids having to initialize the watermarks to the max
value first.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480354637-14209-5-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8ff1e23d403b..b979e06536b2 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1100,7 +1100,6 @@ static void vlv_compute_wm(struct intel_crtc *crtc) struct drm_i915_private *dev_priv = to_i915(dev); struct vlv_wm_state *wm_state = &crtc->wm_state; struct intel_plane *plane; - int sr_fifo_size = INTEL_INFO(dev_priv)->num_pipes * 512 - 1; int level; memset(wm_state, 0, sizeof(*wm_state)); @@ -1115,13 +1114,6 @@ static void vlv_compute_wm(struct intel_crtc *crtc) if (wm_state->num_active_planes != 1) wm_state->cxsr = false; - if (wm_state->cxsr) { - for (level = 0; level < wm_state->num_levels; level++) { - wm_state->sr[level].plane = sr_fifo_size; - wm_state->sr[level].cursor = 63; - } - } - for_each_intel_plane_on_crtc(dev, crtc, plane) { struct intel_plane_state *state = to_intel_plane_state(plane->base.state); @@ -1172,14 +1164,14 @@ static void vlv_compute_wm(struct intel_crtc *crtc) case DRM_PLANE_TYPE_PRIMARY: for (level = 0; level < wm_state->num_levels; level++) wm_state->sr[level].plane = - min(wm_state->sr[level].plane, + max(wm_state->sr[level].plane, wm_state->wm[level].primary); break; case DRM_PLANE_TYPE_OVERLAY: sprite = vlv_sprite_id(plane->id); for (level = 0; level < wm_state->num_levels; level++) wm_state->sr[level].plane = - min(wm_state->sr[level].plane, + max(wm_state->sr[level].plane, wm_state->wm[level].sprite[sprite]); break; } |