drm/i915: Fix glk watermark calculations
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Thu, 30 Apr 2020 12:58:21 +0000 (15:58 +0300)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 11 May 2020 13:17:58 +0000 (16:17 +0300)
commit260a6c1bdf1e072ae4d96f0d1ec2917237f1b627
tree60654d2c3122bd7ef89f043140a8ac9cc8d0b3e4
parent90c49a09c8495f1eac05b42a3f79fdc6bcb1eef0
drm/i915: Fix glk watermark calculations

GLK wants the +1 adjustement for the "blocks per line" value
for x-tile/y-tile, just like cnl+.

Also the x-tile and linear cases are almost identical. The only
difference is this +1 which is always done for glk+, and only
done for linear on skl/bxt. Let's unify it to a single branch
with a special case for the +1, just like we do for y-tile.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200430125822.21985-1-ville.syrjala@linux.intel.com
Reviewed-by: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
drivers/gpu/drm/i915/intel_pm.c