diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-12-03 06:25:09 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-12-03 06:25:23 +0300 |
| commit | 5eb3c85e343ae62ed47fa3c9816d79f95809fe27 (patch) | |
| tree | 856e789d37033223529cc35bd5af87244ed06983 /drivers/gpu/drm/etnaviv/etnaviv_drv.h | |
| parent | e6c7c9d01f5b1ca3141dca43159a909a596a60a2 (diff) | |
| parent | 4612bad5701e158f3c40951f2c7aa8e64b3445eb (diff) | |
| download | linux-5eb3c85e343ae62ed47fa3c9816d79f95809fe27.tar.xz | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
Again, nothing big this time. Mostly a new performance counter from
Christian, some more lockdep annotations from Guido and removal of
functionality that duplicates driver core from Robin.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/81367a99b8949584e5becd334ac001b9ad3dc37a.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_drv.h')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index f5be627e1de0..003288ebd896 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -33,7 +33,6 @@ struct etnaviv_file_private { struct etnaviv_drm_private { int num_gpus; - struct device_dma_parameters dma_parms; struct etnaviv_gpu *gpu[ETNA_MAX_PIPES]; gfp_t shm_gfp_mask; |