On Mon, Oct 07, 2024 at 02:57:11PM +1100, Jonathan Gray wrote:

This reverts commit a53841b074cc196c3caaa37e1f15d6bc90943b97.

duplicated a change made in 6.6.46 718d83f66fb07b2cab89a1fc984613a00e3db18f

Cc: stable@vger.kernel.org # 6.6 Signed-off-by: Jonathan Gray jsg@jsg.id.au

---

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 3 --- 1 file changed, 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c index 7fb11445a28f..d390e3d62e56 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -1266,9 +1266,6 @@ static bool is_dsc_need_re_compute( } }

• if (new_stream_on_link_num == 0)

• return false;
  

• if (new_stream_on_link_num == 0) return false;

2.46.1

The whole drm tree is messed up when it comes to stable patches. Duplicates like this happen all the time due to their bizarre workflow that causes this to happen at least once a release, and is still a major pain to deal with.

I dread the -rc1 merge window each time for the drm patches and put them off until I have gotten through everything else. Can you please work with those developers to make this go better to prevent this from constantly happening?

thanks,

greg k-h