Commit 236c48e6 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Skip useless watermark/FIFO related work on VLV/CHV when not needed

Check whether anything relevant has actually change when we compute new
watermarks for each plane in the state. If the watermarks for no
primary/sprite planes changed we don't have to recompute the FIFO split
or reprogram the DSBARB registers. And even the cursor watermarks didn't
change we can skip the merge+invert step between all the planes on
the pipe as well.

v2: s/noninverted/raw/ for consistency with other platforms
v3: Drop duplicated vlv_get_fifo_size() call during init
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170302171508.1666-9-ville.syrjala@linux.intel.com
parent ff32c54e
...@@ -99,6 +99,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) ...@@ -99,6 +99,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc)
crtc_state->update_wm_pre = false; crtc_state->update_wm_pre = false;
crtc_state->update_wm_post = false; crtc_state->update_wm_post = false;
crtc_state->fb_changed = false; crtc_state->fb_changed = false;
crtc_state->fifo_changed = false;
crtc_state->wm.need_postvbl_update = false; crtc_state->wm.need_postvbl_update = false;
crtc_state->fb_bits = 0; crtc_state->fb_bits = 0;
......
...@@ -573,6 +573,7 @@ struct intel_crtc_state { ...@@ -573,6 +573,7 @@ struct intel_crtc_state {
bool disable_cxsr; bool disable_cxsr;
bool update_wm_pre, update_wm_post; /* watermarks are updated */ bool update_wm_pre, update_wm_post; /* watermarks are updated */
bool fb_changed; /* fb on any of the planes is changed */ bool fb_changed; /* fb on any of the planes is changed */
bool fifo_changed; /* FIFO split is changed */
/* Pipe source size (ie. panel fitter input size) /* Pipe source size (ie. panel fitter input size)
* All planes will be positioned inside this space, * All planes will be positioned inside this space,
......
...@@ -1128,30 +1128,35 @@ static u16 vlv_invert_wm_value(u16 wm, u16 fifo_size) ...@@ -1128,30 +1128,35 @@ static u16 vlv_invert_wm_value(u16 wm, u16 fifo_size)
* Starting from 'level' set all higher * Starting from 'level' set all higher
* levels to 'value' in the "raw" watermarks. * levels to 'value' in the "raw" watermarks.
*/ */
static void vlv_raw_plane_wm_set(struct intel_crtc_state *crtc_state, static bool vlv_raw_plane_wm_set(struct intel_crtc_state *crtc_state,
int level, enum plane_id plane_id, u16 value) int level, enum plane_id plane_id, u16 value)
{ {
struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev); struct drm_i915_private *dev_priv = to_i915(crtc_state->base.crtc->dev);
int num_levels = vlv_num_wm_levels(dev_priv); int num_levels = vlv_num_wm_levels(dev_priv);
bool dirty = false;
for (; level < num_levels; level++) { for (; level < num_levels; level++) {
struct vlv_pipe_wm *raw = &crtc_state->wm.vlv.raw[level]; struct vlv_pipe_wm *raw = &crtc_state->wm.vlv.raw[level];
dirty |= raw->plane[plane_id] != value;
raw->plane[plane_id] = value; raw->plane[plane_id] = value;
} }
return dirty;
} }
static void vlv_plane_wm_compute(struct intel_crtc_state *crtc_state, static bool vlv_plane_wm_compute(struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state) const struct intel_plane_state *plane_state)
{ {
struct intel_plane *plane = to_intel_plane(plane_state->base.plane); struct intel_plane *plane = to_intel_plane(plane_state->base.plane);
enum plane_id plane_id = plane->id; enum plane_id plane_id = plane->id;
int num_levels = vlv_num_wm_levels(to_i915(plane->base.dev)); int num_levels = vlv_num_wm_levels(to_i915(plane->base.dev));
int level; int level;
bool dirty = false;
if (!plane_state->base.visible) { if (!plane_state->base.visible) {
vlv_raw_plane_wm_set(crtc_state, 0, plane_id, 0); dirty |= vlv_raw_plane_wm_set(crtc_state, 0, plane_id, 0);
return; goto out;
} }
for (level = 0; level < num_levels; level++) { for (level = 0; level < num_levels; level++) {
...@@ -1166,17 +1171,22 @@ static void vlv_plane_wm_compute(struct intel_crtc_state *crtc_state, ...@@ -1166,17 +1171,22 @@ static void vlv_plane_wm_compute(struct intel_crtc_state *crtc_state,
if (wm > max_wm) if (wm > max_wm)
break; break;
dirty |= raw->plane[plane_id] != wm;
raw->plane[plane_id] = wm; raw->plane[plane_id] = wm;
} }
/* mark all higher levels as invalid */ /* mark all higher levels as invalid */
vlv_raw_plane_wm_set(crtc_state, level, plane_id, USHRT_MAX); dirty |= vlv_raw_plane_wm_set(crtc_state, level, plane_id, USHRT_MAX);
DRM_DEBUG_KMS("%s wms: [0]=%d,[1]=%d,[2]=%d\n", out:
plane->base.name, if (dirty)
crtc_state->wm.vlv.raw[VLV_WM_LEVEL_PM2].plane[plane_id], DRM_DEBUG_KMS("%s wms: [0]=%d,[1]=%d,[2]=%d\n",
crtc_state->wm.vlv.raw[VLV_WM_LEVEL_PM5].plane[plane_id], plane->base.name,
crtc_state->wm.vlv.raw[VLV_WM_LEVEL_DDR_DVFS].plane[plane_id]); crtc_state->wm.vlv.raw[VLV_WM_LEVEL_PM2].plane[plane_id],
crtc_state->wm.vlv.raw[VLV_WM_LEVEL_PM5].plane[plane_id],
crtc_state->wm.vlv.raw[VLV_WM_LEVEL_DDR_DVFS].plane[plane_id]);
return dirty;
} }
static bool vlv_plane_wm_is_valid(const struct intel_crtc_state *crtc_state, static bool vlv_plane_wm_is_valid(const struct intel_crtc_state *crtc_state,
...@@ -1209,10 +1219,12 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state) ...@@ -1209,10 +1219,12 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state)
&crtc_state->wm.vlv.fifo_state; &crtc_state->wm.vlv.fifo_state;
int num_active_planes = hweight32(crtc_state->active_planes & int num_active_planes = hweight32(crtc_state->active_planes &
~BIT(PLANE_CURSOR)); ~BIT(PLANE_CURSOR));
bool needs_modeset = drm_atomic_crtc_needs_modeset(&crtc_state->base);
struct intel_plane_state *plane_state; struct intel_plane_state *plane_state;
struct intel_plane *plane; struct intel_plane *plane;
enum plane_id plane_id; enum plane_id plane_id;
int level, ret, i; int level, ret, i;
unsigned int dirty = 0;
for_each_intel_plane_in_state(state, plane, plane_state, i) { for_each_intel_plane_in_state(state, plane, plane_state, i) {
const struct intel_plane_state *old_plane_state = const struct intel_plane_state *old_plane_state =
...@@ -1222,7 +1234,37 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state) ...@@ -1222,7 +1234,37 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state)
old_plane_state->base.crtc != &crtc->base) old_plane_state->base.crtc != &crtc->base)
continue; continue;
vlv_plane_wm_compute(crtc_state, plane_state); if (vlv_plane_wm_compute(crtc_state, plane_state))
dirty |= BIT(plane->id);
}
/*
* DSPARB registers may have been reset due to the
* power well being turned off. Make sure we restore
* them to a consistent state even if no primary/sprite
* planes are initially active.
*/
if (needs_modeset)
crtc_state->fifo_changed = true;
if (!dirty)
return 0;
/* cursor changes don't warrant a FIFO recompute */
if (dirty & ~BIT(PLANE_CURSOR)) {
const struct intel_crtc_state *old_crtc_state =
to_intel_crtc_state(crtc->base.state);
const struct vlv_fifo_state *old_fifo_state =
&old_crtc_state->wm.vlv.fifo_state;
ret = vlv_compute_fifo(crtc_state);
if (ret)
return ret;
if (needs_modeset ||
memcmp(old_fifo_state, fifo_state,
sizeof(*fifo_state)) != 0)
crtc_state->fifo_changed = true;
} }
/* initially allow all levels */ /* initially allow all levels */
...@@ -1235,10 +1277,6 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state) ...@@ -1235,10 +1277,6 @@ static int vlv_compute_pipe_wm(struct intel_crtc_state *crtc_state)
wm_state->cxsr = crtc->pipe != PIPE_C && wm_state->cxsr = crtc->pipe != PIPE_C &&
crtc->wm.cxsr_allowed && num_active_planes == 1; crtc->wm.cxsr_allowed && num_active_planes == 1;
ret = vlv_compute_fifo(crtc_state);
if (ret)
return ret;
for (level = 0; level < wm_state->num_levels; level++) { for (level = 0; level < wm_state->num_levels; level++) {
const struct vlv_pipe_wm *raw = &crtc_state->wm.vlv.raw[level]; const struct vlv_pipe_wm *raw = &crtc_state->wm.vlv.raw[level];
const int sr_fifo_size = INTEL_INFO(dev_priv)->num_pipes * 512 - 1; const int sr_fifo_size = INTEL_INFO(dev_priv)->num_pipes * 512 - 1;
...@@ -1287,6 +1325,9 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state, ...@@ -1287,6 +1325,9 @@ static void vlv_atomic_update_fifo(struct intel_atomic_state *state,
&crtc_state->wm.vlv.fifo_state; &crtc_state->wm.vlv.fifo_state;
int sprite0_start, sprite1_start, fifo_size; int sprite0_start, sprite1_start, fifo_size;
if (!crtc_state->fifo_changed)
return;
sprite0_start = fifo_state->plane[PLANE_PRIMARY]; sprite0_start = fifo_state->plane[PLANE_PRIMARY];
sprite1_start = fifo_state->plane[PLANE_SPRITE0] + sprite0_start; sprite1_start = fifo_state->plane[PLANE_SPRITE0] + sprite0_start;
fifo_size = fifo_state->plane[PLANE_SPRITE1] + sprite1_start; fifo_size = fifo_state->plane[PLANE_SPRITE1] + sprite1_start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment