Commit 681f8a5c authored by Hans de Goede's avatar Hans de Goede Committed by Ville Syrjälä
Browse files

drm/i915: Fix DISP_POS_Y and DISP_HEIGHT defines 



Commit 428cb15d ("drm/i915: Clean up pre-skl primary plane registers")
introduced DISP_POS_Y and DISP_HEIGHT defines but accidentally set these
their masks to REG_GENMASK(31, 0) instead of REG_GENMASK(31, 16).

This breaks the primary display pane on at least pineview machines, fix
the mask to fix the primary display pane only showing black.

Tested on an Acer One AO532h with an Intel N450 SoC.

Fixes: 428cb15d ("drm/i915: Clean up pre-skl primary plane registers")
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220418150936.5499-1-hdegoede@redhat.com


Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
parent 72c3c8d6

drivers/gpu/drm/i915/i915_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -4352,12 +4352,12 @@ 
#define _DSPAADDR				0x70184

#define _DSPASTRIDE				0x70188

#define _DSPAPOS				0x7018C /* reserved */

#define   DISP_POS_Y_MASK		REG_GENMASK(31, 0)

#define   DISP_POS_Y_MASK		REG_GENMASK(31, 16)

#define   DISP_POS_Y(y)			REG_FIELD_PREP(DISP_POS_Y_MASK, (y))

#define   DISP_POS_X_MASK		REG_GENMASK(15, 0)

#define   DISP_POS_X(x)			REG_FIELD_PREP(DISP_POS_X_MASK, (x))

#define _DSPASIZE				0x70190

#define   DISP_HEIGHT_MASK		REG_GENMASK(31, 0)

#define   DISP_HEIGHT_MASK		REG_GENMASK(31, 16)

#define   DISP_HEIGHT(h)		REG_FIELD_PREP(DISP_HEIGHT_MASK, (h))

#define   DISP_WIDTH_MASK		REG_GENMASK(15, 0)

#define   DISP_WIDTH(w)			REG_FIELD_PREP(DISP_WIDTH_MASK, (w))