FAILED: patch "[PATCH] drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in" failed to apply to 4.9-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
32859f7335d838ee373c40ee0b3c0c6ebc87a488Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
Date: Tue, 6 Dec 2016 18:33:03 +0900
Subject: [PATCH] drm/amdgpu/dce6: Set MASTER_UPDATE_MODE to 0 in
resume_mc_access as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Looks like this was missed when dce_v6_0.c was added.
Fixes e2cdf640cbb5 ("drm/amdgpu: add display controller implementation for si v10")
Reviewed-by Christian König <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Signed-off-by Michel Dänzer <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +1 -2
@@ -460,9 +460,8 @@ static void dce_v6_0_resume_mc_access(struct amdgpu_device *adev,for (i =0 ; i < adev->mode_info.num_crtc; i++) {if (save->crtc_enabled[i]) { tmp =RREG32 (mmMASTER_UPDATE_MODE + crtc_offsets[i]); -if ((tmp &0x7 ) !=3 ) { +if ((tmp &0x7 ) !=0 ) { tmp &= ~0x7 ; - tmp |=0x3 ;WREG32 (mmMASTER_UPDATE_MODE + crtc_offsets[i], tmp); } tmp =RREG32 (mmGRPH_UPDATE + crtc_offsets[i]);