Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe96791 authored by Manasi Navare's avatar Manasi Navare Committed by Rodrigo Vivi
Browse files

drm/i915/dsc: Fix PPS register definition macros for 2nd VDSC engine 



This patch fixes the PPS4 and PPS5 register definition macros that were
resulting into an incorect MMIO address.

Fixes: 2efbb2f0 ("i915/dp/dsc: Add DSC PPS register definitions")
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarManasi Navare <manasi.d.navare@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180824014807.14681-1-manasi.d.navare@intel.com


(cherry picked from commit 5df52391ddbed869c7d67b00fbb013bd64334115)
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 39933470

drivers/gpu/drm/i915/i915_reg.h

+2 −2
Original line number Diff line number Diff line
@@ -10422,7 +10422,7 @@ enum skl_power_gate { 
							   _ICL_DSC0_PICTURE_PARAMETER_SET_4_PB, \

							   _ICL_DSC0_PICTURE_PARAMETER_SET_4_PC)

#define ICL_DSC1_PICTURE_PARAMETER_SET_4(pipe)	_MMIO_PIPE((pipe) - PIPE_B, \

							   _ICL_DSC0_PICTURE_PARAMETER_SET_4_PB, \

							   _ICL_DSC1_PICTURE_PARAMETER_SET_4_PB, \

							   _ICL_DSC1_PICTURE_PARAMETER_SET_4_PC)

#define  DSC_INITIAL_DEC_DELAY(dec_delay)       ((dec_delay) << 16)

#define  DSC_INITIAL_XMIT_DELAY(xmit_delay)     ((xmit_delay) << 0)
@@ -10437,7 +10437,7 @@ enum skl_power_gate { 
							   _ICL_DSC0_PICTURE_PARAMETER_SET_5_PB, \

							   _ICL_DSC0_PICTURE_PARAMETER_SET_5_PC)

#define ICL_DSC1_PICTURE_PARAMETER_SET_5(pipe)	_MMIO_PIPE((pipe) - PIPE_B, \

							   _ICL_DSC1_PICTURE_PARAMETER_SET_5_PC, \

							   _ICL_DSC1_PICTURE_PARAMETER_SET_5_PB, \

							   _ICL_DSC1_PICTURE_PARAMETER_SET_5_PC)

#define  DSC_SCALE_DEC_INTINT(scale_dec)	((scale_dec) << 16)

#define  DSC_SCALE_INC_INT(scale_inc)		((scale_inc) << 0)