Merge tag 'drm-intel-next-fixes-2020-10-22' of git://anongit.freedesktop.org/drm...

[linux.git] / drivers / gpu / drm / amd / amdgpu / atom.c

diff --git a/drivers/gpu/drm/amd/amdgpu/atom.c b/drivers/gpu/drm/amd/amdgpu/atom.c
index cae426c7c0863b06c7c50fcbefae95ce37262ba0..4cfc786699c7fcaac2b903c463ea85bbd9379812 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/atom.c
+++ b/drivers/gpu/drm/amd/amdgpu/atom.c
@@ -54,6 +54,8 @@
 #define PLL_INDEX      2
 #define PLL_DATA       3
 
+#define ATOM_CMD_TIMEOUT_SEC   20
+
 typedef struct {
        struct atom_context *ctx;
        uint32_t *ps, *ws;
@@ -744,8 +746,9 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg)
                        cjiffies = jiffies;
                        if (time_after(cjiffies, ctx->last_jump_jiffies)) {
                                cjiffies -= ctx->last_jump_jiffies;
-                               if ((jiffies_to_msecs(cjiffies) > 10000)) {
-                                       DRM_ERROR("atombios stuck in loop for more than 10secs aborting\n");
+                               if ((jiffies_to_msecs(cjiffies) > ATOM_CMD_TIMEOUT_SEC*1000)) {
+                                       DRM_ERROR("atombios stuck in loop for more than %dsecs aborting\n",
+                                                 ATOM_CMD_TIMEOUT_SEC);
                                        ctx->abort = true;
                                }
                        } else {