On Tue, 06 Sep 2022, "Lisovskiy, Stanislav" <stanislav.lisovskiy@xxxxxxxxx> wrote: > On Tue, Sep 06, 2022 at 06:43:22PM +0300, Jani Nikula wrote: >> On Tue, 06 Sep 2022, Jani Nikula <jani.nikula@xxxxxxxxx> wrote: >> > On Mon, 05 Sep 2022, Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx> wrote: >> >> Adding DP DSC register definitions, we might need for further >> >> DSC implementation, supporting MST and DP branch pass-through mode. >> >> >> >> v2: - Fixed checkpatch comment warning >> >> v3: - Removed function which is not yet used(Jani Nikula) >> >> >> >> Reviewed-by: Vinod Govindapillai <vinod.govindapillai@xxxxxxxxx> >> >> >> >> Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx> >> > >> > Maarten, Maxime, Thomas - >> > >> > So this got pushed to drm-intel-next without your acks. Apologies. Can >> > we live with it, or want a revert? >> >> I've reverted anyway for other reasons. But can we have an ack for the >> future? :) >> >> BR, >> Jani. > > I've resolved the conflict properly now(not the best way of learning about > drm-rerere) but I guess its too late now. Sorry for the hassle. Yeah, I'm sorry too. The conflict looked too involved for us to figure out right now, with the diverged baselines between drm-misc-next and drm-intel-next, so Rodrigo and I decided to go for the revert. We needed to get drm-tip building again. And really, the patches as applied on top of current drm-intel-next weren't tested, because they were changed on the fly. > But what am I supposed to do now? Should proceed with merge again or > wait for some acks? > Patches basically would be the same anyway. The patches will be the same, but we'll need to get the baseline resolved first. drm-misc-next and drm-intel-next have diverged on intel_dp_mst.c, due to Lyude's DP MST changes, and we'll need to get them in sync in drm-intel-next before applying the patches. It'll be the easiest for everyone. In practice this means a drm-misc-next pull request to drm-next, and then a backmerge from drm-next to drm-intel-next. There was a drm-misc-next pull request merged today, but only up to tag drm-misc-next-2022-08-20-1, and there's 88 commits in drm-misc-next since. Including Lyude's changes. BR, Jani. > > Stan > >> >> > >> > >> > BR, >> > Jani. >> > >> > >> >> --- >> >> include/drm/display/drm_dp.h | 10 +++++++++- >> >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> >> >> diff --git a/include/drm/display/drm_dp.h b/include/drm/display/drm_dp.h >> >> index 6c0871164771..02c4b6f20478 100644 >> >> --- a/include/drm/display/drm_dp.h >> >> +++ b/include/drm/display/drm_dp.h >> >> @@ -239,6 +239,9 @@ >> >> >> >> #define DP_DSC_SUPPORT 0x060 /* DP 1.4 */ >> >> # define DP_DSC_DECOMPRESSION_IS_SUPPORTED (1 << 0) >> >> +# define DP_DSC_PASS_THROUGH_IS_SUPPORTED (1 << 1) >> >> +# define DP_DSC_DYNAMIC_PPS_UPDATE_SUPPORT_COMP_TO_COMP (1 << 2) >> >> +# define DP_DSC_DYNAMIC_PPS_UPDATE_SUPPORT_UNCOMP_TO_COMP (1 << 3) >> >> >> >> #define DP_DSC_REV 0x061 >> >> # define DP_DSC_MAJOR_MASK (0xf << 0) >> >> @@ -277,12 +280,15 @@ >> >> >> >> #define DP_DSC_BLK_PREDICTION_SUPPORT 0x066 >> >> # define DP_DSC_BLK_PREDICTION_IS_SUPPORTED (1 << 0) >> >> +# define DP_DSC_RGB_COLOR_CONV_BYPASS_SUPPORT (1 << 1) >> >> >> >> #define DP_DSC_MAX_BITS_PER_PIXEL_LOW 0x067 /* eDP 1.4 */ >> >> >> >> #define DP_DSC_MAX_BITS_PER_PIXEL_HI 0x068 /* eDP 1.4 */ >> >> # define DP_DSC_MAX_BITS_PER_PIXEL_HI_MASK (0x3 << 0) >> >> # define DP_DSC_MAX_BITS_PER_PIXEL_HI_SHIFT 8 >> >> +# define DP_DSC_MAX_BPP_DELTA_VERSION_MASK 0x06 >> >> +# define DP_DSC_MAX_BPP_DELTA_AVAILABILITY 0x08 >> >> >> >> #define DP_DSC_DEC_COLOR_FORMAT_CAP 0x069 >> >> # define DP_DSC_RGB (1 << 0) >> >> @@ -344,11 +350,13 @@ >> >> # define DP_DSC_24_PER_DP_DSC_SINK (1 << 2) >> >> >> >> #define DP_DSC_BITS_PER_PIXEL_INC 0x06F >> >> +# define DP_DSC_RGB_YCbCr444_MAX_BPP_DELTA_MASK 0x1f >> >> +# define DP_DSC_RGB_YCbCr420_MAX_BPP_DELTA_MASK 0xe0 >> >> # define DP_DSC_BITS_PER_PIXEL_1_16 0x0 >> >> # define DP_DSC_BITS_PER_PIXEL_1_8 0x1 >> >> # define DP_DSC_BITS_PER_PIXEL_1_4 0x2 >> >> # define DP_DSC_BITS_PER_PIXEL_1_2 0x3 >> >> -# define DP_DSC_BITS_PER_PIXEL_1 0x4 >> >> +# define DP_DSC_BITS_PER_PIXEL_1_1 0x4 >> >> >> >> #define DP_PSR_SUPPORT 0x070 /* XXX 1.2? */ >> >> # define DP_PSR_IS_SUPPORTED 1 >> >> -- >> Jani Nikula, Intel Open Source Graphics Center -- Jani Nikula, Intel Open Source Graphics Center
