On Tue, 2019-02-05 at 22:50 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > 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. Reviewed-by: José Roberto de Souza <jose.souza@xxxxxxxxx> > > Cc: José Roberto de Souza <jose.souza@xxxxxxxxx> > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > --- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_reg.h > b/drivers/gpu/drm/i915/i915_reg.h > index 12964b0fbc54..2be34e13af78 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -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)))
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx