]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/amdgpu: add more cases to DCE11 possible crtc mask setup
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 10 Feb 2017 05:00:52 +0000 (00:00 -0500)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 15 Mar 2017 15:32:11 +0000 (10:32 -0500)
BugLink: http://bugs.launchpad.net/bugs/1673118
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>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

index a7af5b33a5e30e1279619c096295e12e415acafe..648f0d7475db80e9cc0b85331eea19323ecee2bd 100644 (file)
@@ -3737,9 +3737,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev,
        default:
                encoder->possible_crtcs = 0x3;
                break;
+       case 3:
+               encoder->possible_crtcs = 0x7;
+               break;
        case 4:
                encoder->possible_crtcs = 0xf;
                break;
+       case 5:
+               encoder->possible_crtcs = 0x1f;
+               break;
        case 6:
                encoder->possible_crtcs = 0x3f;
                break;