diff options
| author |   jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
| commit | c349dbc7938c71a30e13c1be4acc1976165f4630 (patch) | |
| tree | 8798187dfd7a927a15123e8dad31b782b074baa8 /sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c | |
| parent | The errcheck() function treats an errno of ERANGE or EDOM as something (diff) | |
| download | wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.tar.xz wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.zip | |
update drm to linux 5.7
adds kernel support for
amdgpu: vega20, raven2, renoir, navi10, navi14
inteldrm: icelake, tigerlake
Thanks to the OpenBSD Foundation for sponsoring this work, kettenis@ for
helping, patrick@ for helping adapt rockchip drm and many developers for
testing.
Diffstat (limited to 'sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c index 71750b310d7..ad42114257b 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_atom.c @@ -27,6 +27,8 @@ #include <linux/slab.h> #include <asm/unaligned.h> +#include <drm/drm_util.h> + #define ATOM_DEBUG #include "atom.h" @@ -92,10 +94,6 @@ static void debug_print_spaces(int n) printk(" "); } -#ifdef DEBUG -#undef DEBUG -#endif - #define DEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG __VA_ARGS__); } while (0) #define SDEBUG(...) do if (amdgpu_atom_debug) { printk(KERN_DEBUG); debug_print_spaces(debug_depth); printk(__VA_ARGS__); } while (0) #else @@ -746,8 +744,8 @@ 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) > 5000)) { - DRM_ERROR("atombios stuck in loop for more than 5secs aborting\n"); + if ((jiffies_to_msecs(cjiffies) > 10000)) { + DRM_ERROR("atombios stuck in loop for more than 10secs aborting\n"); ctx->abort = true; } } else { |