Skip to content

Commit 76271ef

Browse files
dhnkrnjlahtine-intel
authored andcommitted
drm/i915: Fix VIDEO_DIP_CTL bit shifts
The shifts for VSC_SELECT bits are wrong, fix it. Good thing is the definitions are unused. v2: Moves definitions in another patch (Manasi) Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Anusha Srivatsa <anusha.srivatsa@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Fixes: 7af2be6 ("drm/i915/icl: Add VIDEO_DIP registers") Signed-off-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com> Reviewed-by: Manasi Navare <manasi.d.navare@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20181005185643.31660-1-dhinakaran.pandiyan@intel.com (cherry picked from commit 0920966) Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
1 parent 2c2f6e3 commit 76271ef

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/gpu/drm/i915/i915_reg.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4593,12 +4593,12 @@ enum {
45934593

45944594
#define DRM_DIP_ENABLE (1 << 28)
45954595
#define PSR_VSC_BIT_7_SET (1 << 27)
4596-
#define VSC_SELECT_MASK (0x3 << 26)
4597-
#define VSC_SELECT_SHIFT 26
4598-
#define VSC_DIP_HW_HEA_DATA (0 << 26)
4599-
#define VSC_DIP_HW_HEA_SW_DATA (1 << 26)
4600-
#define VSC_DIP_HW_DATA_SW_HEA (2 << 26)
4601-
#define VSC_DIP_SW_HEA_DATA (3 << 26)
4596+
#define VSC_SELECT_MASK (0x3 << 25)
4597+
#define VSC_SELECT_SHIFT 25
4598+
#define VSC_DIP_HW_HEA_DATA (0 << 25)
4599+
#define VSC_DIP_HW_HEA_SW_DATA (1 << 25)
4600+
#define VSC_DIP_HW_DATA_SW_HEA (2 << 25)
4601+
#define VSC_DIP_SW_HEA_DATA (3 << 25)
46024602
#define VDIP_ENABLE_PPS (1 << 24)
46034603

46044604
/* Panel power sequencing */

0 commit comments

Comments
 (0)