diff options
| author | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:45:04 +0000 |
|---|---|---|
| committer | Alice Ryhl <aliceryhl@google.com> | 2025-10-20 11:49:19 +0000 |
| commit | 91321980923477044eaf91ca6445a409c4b9712e (patch) | |
| tree | c2d24d9bcad6bec4387115527b645b30a8d3bd0b /drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | |
| parent | 63e919a31625d5d2878cfc2511274826e29336b2 (diff) | |
| parent | 211ddde0823f1442e4ad052a2f30f050145ccada (diff) | |
Merge tag 'v6.18-rc2' into 'drm-rust-next'
When pushing commits to drm-rust-next, we need to verify that the
patches pass rustfmt. Thus, pull in v6.18-rc2 for its rustfmt fix.
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/mes_userqueue.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c index 2db9b2c63693..1cd9eaeef38f 100644 --- a/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +++ b/drivers/gpu/drm/amd/amdgpu/mes_userqueue.c @@ -208,10 +208,10 @@ static int mes_userq_detect_and_reset(struct amdgpu_device *adev, struct amdgpu_userq_mgr *uqm, *tmp; unsigned int hung_db_num = 0; int queue_id, r, i; - u32 db_array[4]; + u32 db_array[8]; - if (db_array_size > 4) { - dev_err(adev->dev, "DB array size (%d vs 4) too small\n", + if (db_array_size > 8) { + dev_err(adev->dev, "DB array size (%d vs 8) too small\n", db_array_size); return -EINVAL; } |