Skip to content

Commit

Permalink
drm/i915: Kill fbc_enable from hsw_lp_wm_results
Browse files Browse the repository at this point in the history
We don't need to store the FBC WM enabled status in each watermark
level. We anyway have to reduce it down to a single boolean, so just
delay checking the FBC WM limit until we're computing the final
value.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Ville Syrjälä authored and Daniel Vetter committed Aug 8, 2013
1 parent 6f5ddd1 commit 71fff20
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/gpu/drm/i915/intel_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -2182,7 +2182,6 @@ struct hsw_wm_maximums {

struct hsw_lp_wm_result {
bool enable;
bool fbc_enable;
uint32_t pri_val;
uint32_t spr_val;
uint32_t cur_val;
Expand Down Expand Up @@ -2324,13 +2323,6 @@ static bool hsw_compute_lp_wm(struct drm_i915_private *dev_priv,
result->fbc_val = max3(res[0].fbc_val, res[1].fbc_val, res[2].fbc_val);
result->enable = true;

if (result->fbc_val > max->fbc) {
result->fbc_enable = false;
result->fbc_val = 0;
} else {
result->fbc_enable = true;
}

if (!result->enable)
return false;

Expand Down Expand Up @@ -2575,9 +2567,9 @@ static void hsw_compute_wm_results(struct drm_device *dev,
* a WM level. */
results->enable_fbc_wm = true;
for (level = 1; level <= max_level; level++) {
if (!lp_results[level - 1].fbc_enable) {
if (!lp_results[level - 1].fbc_val > lp_maximums->fbc) {
results->enable_fbc_wm = false;
break;
lp_results[level - 1].fbc_val = 0;
}
}

Expand Down

0 comments on commit 71fff20

Please sign in to comment.