aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2017-02-10 00:00:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-14 22:02:48 -0400
commit0734a3213ca83c92e27167624737fd7a2fcbcca5 (patch)
treebb0c827386775ba26b199825642d61c1b7aff4f7
parentb507df2e236e5edc868ea8ac572567f1de0107f7 (diff)
drm/amdgpu: add more cases to DCE11 possible crtc mask setup
commit 4ce3bd45b351633f2a0512c587f7fcba2ce044e8 upstream. Add cases for asics with 3 and 5 crtcs. Fixes an artificial limitation on asics with 3 or 5 crtcs. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=99744 Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/gpu/drm/amd/amdgpu/dce_v11_0.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
index 7ddc32127d88..64a1df62cc65 100644
--- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
@@ -3814,9 +3814,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
3814 default: 3814 default:
3815 encoder->possible_crtcs = 0x3; 3815 encoder->possible_crtcs = 0x3;
3816 break; 3816 break;
3817 case 3:
3818 encoder->possible_crtcs = 0x7;
3819 break;
3817 case 4: 3820 case 4:
3818 encoder->possible_crtcs = 0xf; 3821 encoder->possible_crtcs = 0xf;
3819 break; 3822 break;
3823 case 5:
3824 encoder->possible_crtcs = 0x1f;
3825 break;
3820 case 6: 3826 case 6:
3821 encoder->possible_crtcs = 0x3f; 3827 encoder->possible_crtcs = 0x3f;
3822 break; 3828 break;