Commit c7e716b8 authored Feb 05, 2019 by Ville Syrjälä

drm/i915: Bump skl+ wm blocks to 11 bits

On icl the plane watermark blocks field is 11 bits. Bump our define to
match so that readout won't ignore the extra bit. We can safely do this
for older platforms too since the unused bits are hardwired to zero.

Cc: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190205205056.30081-1-ville.syrjala@linux.intel.com

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

parent 26a11dee

drivers/gpu/drm/i915/i915_reg.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -6000,7 +6000,7 @@ enum {
		#define PLANE_WM_EN (1 << 31)
		#define PLANE_WM_LINES_SHIFT 14
		#define PLANE_WM_LINES_MASK 0x1f
		#define PLANE_WM_BLOCKS_MASK 0x3ff
		#define PLANE_WM_BLOCKS_MASK 0x7ff /* skl+: 10 bits, icl+ 11 bits */

		#define _CUR_WM_0(pipe) _PIPE(pipe, _CUR_WM_A_0, _CUR_WM_B_0)
		#define CUR_WM(pipe, level) _MMIO(_CUR_WM_0(pipe) + ((4) * (level)))