Skip to content

Commit ed911c9

Browse files
jwrdegoedejlahtine-intel
authored andcommitted
drm/i915: Fix DISP_POS_Y and DISP_HEIGHT defines
Commit 428cb15 ("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: 428cb15 ("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: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220418150936.5499-1-hdegoede@redhat.com Reviewed-by: José Roberto de Souza <jose.souza@intel.com> (cherry picked from commit 681f8a5) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent af2d861 commit ed911c9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4345,12 +4345,12 @@
43454345
#define _DSPAADDR 0x70184
43464346
#define _DSPASTRIDE 0x70188
43474347
#define _DSPAPOS 0x7018C /* reserved */
4348-
#define DISP_POS_Y_MASK REG_GENMASK(31, 0)
4348+
#define DISP_POS_Y_MASK REG_GENMASK(31, 16)
43494349
#define DISP_POS_Y(y) REG_FIELD_PREP(DISP_POS_Y_MASK, (y))
43504350
#define DISP_POS_X_MASK REG_GENMASK(15, 0)
43514351
#define DISP_POS_X(x) REG_FIELD_PREP(DISP_POS_X_MASK, (x))
43524352
#define _DSPASIZE 0x70190
4353-
#define DISP_HEIGHT_MASK REG_GENMASK(31, 0)
4353+
#define DISP_HEIGHT_MASK REG_GENMASK(31, 16)
43544354
#define DISP_HEIGHT(h) REG_FIELD_PREP(DISP_HEIGHT_MASK, (h))
43554355
#define DISP_WIDTH_MASK REG_GENMASK(15, 0)
43564356
#define DISP_WIDTH(w) REG_FIELD_PREP(DISP_WIDTH_MASK, (w))

0 commit comments

Comments
 (0)