summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/include
diff options
context:
space:
mode:
authorDave Airlie2017-09-13 06:34:11 +0200
committerDave Airlie2017-09-13 06:34:11 +0200
commit47e0cd6b1dbbbff7591fe7eecc20bac5ca674351 (patch)
treea6469511eb106cee6898ac521614ab4dea46a576 /drivers/gpu/drm/amd/include
parentMerge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_li... (diff)
parentdrm/amdgpu: revert "fix deadlock of reservation between cs and gpu reset v2" (diff)
downloadkernel-qcow2-linux-47e0cd6b1dbbbff7591fe7eecc20bac5ca674351.tar.gz
kernel-qcow2-linux-47e0cd6b1dbbbff7591fe7eecc20bac5ca674351.tar.xz
kernel-qcow2-linux-47e0cd6b1dbbbff7591fe7eecc20bac5ca674351.zip
Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-next
A few fixes for 4.14. Nothing too major.
Diffstat (limited to 'drivers/gpu/drm/amd/include')
-rw-r--r--drivers/gpu/drm/amd/include/vi_structs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/include/vi_structs.h b/drivers/gpu/drm/amd/include/vi_structs.h
index ca93b5160ba6..3e606a761d0e 100644
--- a/drivers/gpu/drm/amd/include/vi_structs.h
+++ b/drivers/gpu/drm/amd/include/vi_structs.h
@@ -419,8 +419,8 @@ struct vi_mqd_allocation {
struct vi_mqd mqd;
uint32_t wptr_poll_mem;
uint32_t rptr_report_mem;
- uint32_t dyamic_cu_mask;
- uint32_t dyamic_rb_mask;
+ uint32_t dynamic_cu_mask;
+ uint32_t dynamic_rb_mask;
};
struct cz_mqd {