[PULL] topic/amdgpu-dp2.0-mst
topic/amdgpu-dp2.0-mst-2021-10-25: UAPI Changes: Nope! Cross-subsystem Changes: drm_dp_update_payload_part1() takes a new argument for specifying what the VCPI slot start is Core Changes: Make the DP MST helpers aware of the current starting VCPI slot/VCPI total slot count... Driver Changes: ...and then add support for taking advantage of this for 128b/132b links on DP 2.0 for amdgpu The following changes since commit 6f2f7c83303d2227f47551423e507d77d9ea01c7: Merge tag 'drm-intel-gt-next-2021-10-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2021-10-22 06:30:34 +1000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/topic/amdgpu-dp2.0-mst-2021- 10-25 for you to fetch changes up to 41724ea273cdda5261db4fabd6bfb1375fbc96b2: drm/amd/display: Add DP 2.0 MST DM Support (2021-10-25 21:21:09 -0400) UAPI Changes: Nope! Cross-subsystem Changes: drm_dp_update_payload_part1() takes a new argument for specifying what the VCPI slot start is Core Changes: Make the DP MST helpers aware of the current starting VCPI slot/VCPI total slot count... Driver Changes: ...and then add support for taking advantage of this for 128b/132b links on DP 2.0 for amdgpu Bhawanpreet Lakha (3): drm: Remove slot checks in dp mst topology during commit drm: Update MST First Link Slot Information Based on Encoding Format drm/amd/display: Add DP 2.0 MST DM Support Fangzhi Zuo (1): drm/amd/display: Add DP 2.0 MST DC Support drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 29 ++ .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 3 + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 14 + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 292 + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 19 ++ drivers/gpu/drm/amd/display/dc/dc_link.h | 7 + drivers/gpu/drm/amd/display/dc/dc_stream.h | 13 + drivers/gpu/drm/drm_dp_mst_topology.c | 42 ++- drivers/gpu/drm/i915/display/intel_dp_mst.c | 4 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- include/drm/drm_dp_mst_helper.h | 5 +- 13 files changed, 423 insertions(+), 16 deletions(-)
Re: [PATCH] dim: update drm/for-linux-next-gt
On Fri, Oct 22, 2021 at 1:39 PM Joonas Lahtinen
wrote:
>
> This will allow integrating drm-intel-gt-next with linux-nexlinux-nextt
>
> Signed-off-by: Joonas Lahtinen
Acked-by: Daniel Vetter
> ---
> dim | 27 ---
> 1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/dim b/dim
> index 9da768f..4bc23ee 100755
> --- a/dim
> +++ b/dim
> @@ -532,16 +532,18 @@ function dim_range_diff
> fi
> }
>
> -# update for-linux-next and for-linux-next-fixes branches
> -function update_linux_next # branch next next-fixes fixes
> +# update for-linux-next* branches
> +function update_linux_next # branch next next-fixes fixes [for-linux-next]
> [for-linux-next-fixes]
> {
> - local branch linux_next linux_next_fixes linux_fixes repo remote
> + local branch linux_next linux_next_fixes linux_fixes for_linux_next
> for_linux_next_fixes repo remote
>
> cd $DIM_PREFIX/drm-tip
> branch=$1
> linux_next=$2
> linux_next_fixes=$3
> linux_fixes=$4
> + for_linux_next=${5:-for-linux-next}
> + for_linux_next_fixes=${6:-for-linux-next-fixes}
>
> repo=$(branch_to_repo $branch)
>
> @@ -553,24 +555,25 @@ function update_linux_next # branch next next-fixes
> fixes
>
> git_fetch_helper $remote
>
> - # always update drm-intel-fixes
> - echo -n "Pushing $linux_fixes to for-linux-next-fixes... "
> - git_push $remote +$remote/$linux_fixes:for-linux-next-fixes
> - echo "Done."
> + if [ -n "$for_linux_next_fixes" ] ; then
> + echo -n "Pushing $linux_fixes to $for_linux_next_fixes... "
> + git_push $remote +$remote/$linux_fixes:$for_linux_next_fixes
> + echo "Done."
> + fi
>
> if git merge-base --is-ancestor $remote/$linux_next_fixes
> $remote/$linux_fixes ; then
> # -fixes has caught up to dinf, i.e. we're out of the merge
> # window. Push the next queue.
> - echo -n "Out of merge window. Pushing $linux_next to
> for-linux-next... "
> - git_push $remote +$remote/$linux_next:for-linux-next
> + echo -n "Out of merge window. Pushing $linux_next to
> $for_linux_next... "
> + git_push $remote +$remote/$linux_next:$for_linux_next
> echo "Done."
> else
> # dinf is ahead of -fixes, i.e. drm-next has already closed
> for
> # the next merge window and we've started to gather new fixes
> # for the current -next cycle. Push dinf
>
> - echo -n "Pushing $linux_next_fixes to for-linux-next... "
> - git_push $remote +$remote/$linux_next_fixes:for-linux-next
> + echo -n "Pushing $linux_next_fixes to $for_linux_next... "
> + git_push $remote +$remote/$linux_next_fixes:$for_linux_next
> echo "Done."
> fi
> }
> @@ -1021,6 +1024,8 @@ function dim_push_branch
> git_push $remote $branch "$@"
>
> update_linux_next $branch drm-intel-next drm-intel-next-fixes
> drm-intel-fixes
> + update_linux_next $branch drm-intel-gt-next drm-intel-next-fixes
> drm-intel-fixes \
> + for-linux-next-gt "" # no for-linux-next-gt-fixes for now
> update_linux_next $branch drm-misc-next drm-misc-next-fixes
> drm-misc-fixes
> update_linux_next $branch drm-amd-next drm-amd-next-fixes
> drm-amd-fixes
>
> --
> 2.31.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Re: [PATCH] dim: update drm/for-linux-next-gt
+ Jani/Daniel
Quoting Joonas Lahtinen (2021-10-22 14:39:32)
> This will allow integrating drm-intel-gt-next with linux-nexlinux-nextt
>
> Signed-off-by: Joonas Lahtinen
> ---
> dim | 27 ---
> 1 file changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/dim b/dim
> index 9da768f..4bc23ee 100755
> --- a/dim
> +++ b/dim
> @@ -532,16 +532,18 @@ function dim_range_diff
> fi
> }
>
> -# update for-linux-next and for-linux-next-fixes branches
> -function update_linux_next # branch next next-fixes fixes
> +# update for-linux-next* branches
> +function update_linux_next # branch next next-fixes fixes [for-linux-next]
> [for-linux-next-fixes]
> {
> - local branch linux_next linux_next_fixes linux_fixes repo remote
> + local branch linux_next linux_next_fixes linux_fixes for_linux_next
> for_linux_next_fixes repo remote
>
> cd $DIM_PREFIX/drm-tip
> branch=$1
> linux_next=$2
> linux_next_fixes=$3
> linux_fixes=$4
> + for_linux_next=${5:-for-linux-next}
> + for_linux_next_fixes=${6:-for-linux-next-fixes}
>
> repo=$(branch_to_repo $branch)
>
> @@ -553,24 +555,25 @@ function update_linux_next # branch next next-fixes
> fixes
>
> git_fetch_helper $remote
>
> - # always update drm-intel-fixes
> - echo -n "Pushing $linux_fixes to for-linux-next-fixes... "
> - git_push $remote +$remote/$linux_fixes:for-linux-next-fixes
> - echo "Done."
> + if [ -n "$for_linux_next_fixes" ] ; then
> + echo -n "Pushing $linux_fixes to $for_linux_next_fixes... "
> + git_push $remote +$remote/$linux_fixes:$for_linux_next_fixes
> + echo "Done."
> + fi
>
> if git merge-base --is-ancestor $remote/$linux_next_fixes
> $remote/$linux_fixes ; then
> # -fixes has caught up to dinf, i.e. we're out of the merge
> # window. Push the next queue.
> - echo -n "Out of merge window. Pushing $linux_next to
> for-linux-next... "
> - git_push $remote +$remote/$linux_next:for-linux-next
> + echo -n "Out of merge window. Pushing $linux_next to
> $for_linux_next... "
> + git_push $remote +$remote/$linux_next:$for_linux_next
> echo "Done."
> else
> # dinf is ahead of -fixes, i.e. drm-next has already closed
> for
> # the next merge window and we've started to gather new fixes
> # for the current -next cycle. Push dinf
>
> - echo -n "Pushing $linux_next_fixes to for-linux-next... "
> - git_push $remote +$remote/$linux_next_fixes:for-linux-next
> + echo -n "Pushing $linux_next_fixes to $for_linux_next... "
> + git_push $remote +$remote/$linux_next_fixes:$for_linux_next
> echo "Done."
> fi
> }
> @@ -1021,6 +1024,8 @@ function dim_push_branch
> git_push $remote $branch "$@"
>
> update_linux_next $branch drm-intel-next drm-intel-next-fixes
> drm-intel-fixes
> + update_linux_next $branch drm-intel-gt-next drm-intel-next-fixes
> drm-intel-fixes \
> + for-linux-next-gt "" # no for-linux-next-gt-fixes for now
> update_linux_next $branch drm-misc-next drm-misc-next-fixes
> drm-misc-fixes
> update_linux_next $branch drm-amd-next drm-amd-next-fixes
> drm-amd-fixes
>
> --
> 2.31.1
>
