]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/radeon: add a delay after ATPX dGPU power off
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 1 Jun 2016 16:58:36 +0000 (12:58 -0400)
committerSasha Levin <alexander.levin@verizon.com>
Mon, 22 Aug 2016 16:23:05 +0000 (12:23 -0400)
[ Upstream commit d814b24fb74cb9797d70cb8053961447c5879a5c ]

ATPX dGPU power control requires a 200ms delay between
power off and on.  This should fix dGPU failures on
resume from power off.

Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
drivers/gpu/drm/radeon/radeon_atpx_handler.c

index 8bc7d0bbd3c80a94529cea79bf4f078d7951a87a..868247c22de4a67f5d9ece2e36702825968d3aa2 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/slab.h>
 #include <linux/acpi.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include "radeon_acpi.h"
 
@@ -255,6 +256,10 @@ static int radeon_atpx_set_discrete_state(struct radeon_atpx *atpx, u8 state)
                if (!info)
                        return -EIO;
                kfree(info);
+
+               /* 200ms delay is required after off */
+               if (state == 0)
+                       msleep(200);
        }
        return 0;
 }