diff options
| author | Rob Clark <robdclark@chromium.org> | 2023-12-10 10:07:54 -0800 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2023-12-10 10:07:54 -0800 |
| commit | cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65 (patch) | |
| tree | 307e1e7bd42f3b451182f3a548f2169aef3c6ddf /drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | |
| parent | a08935fc859b22884dcb6b5126d3a986467101ce (diff) | |
| parent | fca9448ae2f5ddebd841c727ee86136e1b5cbd86 (diff) | |
| download | linux-cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65.tar.gz linux-cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65.tar.bz2 linux-cbaf84e73811ed0ff7ff6d7f52b73fd7ed082d65.zip | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next
Backmerge drm-misc-next to pick up some dependencies for drm/msm
patches, in particular:
https://patchwork.freedesktop.org/patch/570219/?series=127251&rev=1
https://patchwork.freedesktop.org/series/123411/
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index df3ecfa9e13f..e50be6500030 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -207,7 +207,7 @@ static int amdgpu_cs_pass1(struct amdgpu_cs_parser *p, } for (i = 0; i < p->nchunks; i++) { - struct drm_amdgpu_cs_chunk __user **chunk_ptr = NULL; + struct drm_amdgpu_cs_chunk __user *chunk_ptr = NULL; struct drm_amdgpu_cs_chunk user_chunk; uint32_t __user *cdata; |