diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-07-04 07:52:50 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-07-04 07:52:50 +0300 |
| commit | 4cf643a39221af24a151ad2cff4e3f95f12f368e (patch) | |
| tree | 0d6cca090292ea16cc7c75ee07d63c2cb1d979c7 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | 44c153671296ecdee7c75aaf778f054ffaf1ee00 (diff) | |
| parent | 440e80ce02cde7b810e4eb555768c2d77e7a27c8 (diff) | |
| download | linux-4cf643a39221af24a151ad2cff4e3f95f12f368e.tar.xz | |
Merge tag 'drm-next-5.3-2019-06-27' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-next-5.3-2019-06-27:
amdgpu:
- Fix warning on 32 bit ARM
- Fix compilation on big endian
- Misc bug fixes
ttm:
- Live lock fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190628015555.3384-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 92d415a4ee47..3913a75924c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -702,7 +702,7 @@ MODULE_PARM_DESC(hws_gws_support, "MEC FW support gws barriers (false = not supp * DOC: queue_preemption_timeout_ms (int) * queue preemption timeout in ms (1 = Minimum, 9000 = default) */ -int queue_preemption_timeout_ms; +int queue_preemption_timeout_ms = 9000; module_param(queue_preemption_timeout_ms, int, 0644); MODULE_PARM_DESC(queue_preemption_timeout_ms, "queue preemption timeout in ms (1 = Minimum, 9000 = default)"); #endif |