diff options
| author | Daniel Vetter <[email protected]> | 2017-03-23 08:15:18 +0100 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2017-03-23 08:15:18 +0100 |
| commit | aa18bc8ddcb3ffe3fdb87a59b81371fb8bceea38 (patch) | |
| tree | 0547955f584ec0865ddaf0762053f69279a014e7 /drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | |
| parent | 93aa2a1c25e562cc0ca69c3175333fe33fdf055b (diff) | |
| parent | 65d1086c44791112188f6aebbdc3a27cab3736d3 (diff) | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge drm-next to get at the hdmi2.0 helper functions.
Signed-off-by: Daniel Vetter <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c index 31375bdde6f1..011800f621c6 100644 --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c @@ -788,7 +788,7 @@ static int sdma_v3_0_start(struct amdgpu_device *adev) } } - /* disble sdma engine before programing it */ + /* disable sdma engine before programing it */ sdma_v3_0_ctx_switch_enable(adev, false); sdma_v3_0_enable(adev, false); |