diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-06-19 16:33:14 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-06-19 16:33:14 +0200 |
| commit | de8a334f215c5a5c5bb070df4325af824d7eaaf1 (patch) | |
| tree | b1106ab401a46ce66725f61a7d1b067e9a08f859 /drivers/accel/habanalabs/common/command_buffer.c | |
| parent | 0adec22702d497385dbdc52abb165f379a00efba (diff) | |
| parent | 2222dcb0775d36de28992f56455ab3967b30d380 (diff) | |
Merge drm/drm-next into drm-misc-next
Backmerging into drm-misc-next to get commit 2c1c7ba457d4
("drm/amdgpu: support partition drm devices"), which is required to fix
commit 0adec22702d4 ("drm: Remove struct drm_driver.gem_prime_mmap").
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/accel/habanalabs/common/command_buffer.c')
| -rw-r--r-- | drivers/accel/habanalabs/common/command_buffer.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/accel/habanalabs/common/command_buffer.c b/drivers/accel/habanalabs/common/command_buffer.c index 6e09f48750a0..08f7aee42624 100644 --- a/drivers/accel/habanalabs/common/command_buffer.c +++ b/drivers/accel/habanalabs/common/command_buffer.c @@ -27,12 +27,6 @@ static int cb_map_mem(struct hl_ctx *ctx, struct hl_cb *cb) return -EINVAL; } - if (!hdev->mmu_enable) { - dev_err_ratelimited(hdev->dev, - "Cannot map CB because MMU is disabled\n"); - return -EINVAL; - } - if (cb->is_mmu_mapped) return 0; |