diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
| commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
| tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |
| parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 f2e8b4238efd..5376328d3fd0 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
| @@ -148,7 +148,7 @@ struct amdgpu_mgpu_info mgpu_info = { | |||
| 148 | .mutex = __MUTEX_INITIALIZER(mgpu_info.mutex), | 148 | .mutex = __MUTEX_INITIALIZER(mgpu_info.mutex), |
| 149 | }; | 149 | }; |
| 150 | int amdgpu_ras_enable = -1; | 150 | int amdgpu_ras_enable = -1; |
| 151 | uint amdgpu_ras_mask = 0xffffffff; | 151 | uint amdgpu_ras_mask = 0xfffffffb; |
| 152 | 152 | ||
| 153 | /** | 153 | /** |
| 154 | * DOC: vramlimit (int) | 154 | * DOC: vramlimit (int) |