diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-12-02 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-12-02 10:21:12 +1000 |
| commit | 36a170b1ca0da12641b1d847524f17b4aa2a2283 (patch) | |
| tree | 925b84af22798759249af133ad555dce611d1bfa /drivers/gpu/drm/msm/adreno/a3xx_gpu.h | |
| parent | acc61b8929365e63a3e8c8c8913177795aa45594 (diff) | |
| parent | e20c9284c8f212081afc28471daaac9b0d54252f (diff) | |
Merge tag 'drm-msm-next-2019-11-05' of https://gitlab.freedesktop.org/drm/msm into drm-next
+ OCMEM support to enable the couple generations that had shared OCMEM
rather than GMEM exclusively for the GPU (late a3xx and I think basically
all of a4xx). Bjorn and Brian decided to land this through the drm
tree to avoid having to coordinate merge requests.
+ a510 support, and various associated display support
+ the usual misc cleanups and fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CAF6AEGv-JWswEJRxe5AmnGQO1SZnpxK05kO1E29K6UUzC9GMMw@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/adreno/a3xx_gpu.h')
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h index 5dc33e5ea53b..c555fb13e0d7 100644 --- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.h +++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.h @@ -19,8 +19,7 @@ struct a3xx_gpu { struct adreno_gpu base; /* if OCMEM is used for GMEM: */ - uint32_t ocmem_base; - void *ocmem_hdl; + struct adreno_ocmem ocmem; }; #define to_a3xx_gpu(x) container_of(x, struct a3xx_gpu, base) |