diff options
author | Dave Airlie <airlied@redhat.com> | 2019-05-07 08:27:15 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2019-05-07 08:27:23 +1000 |
commit | d62bef1016e944a7602d6fade214f28e1f2157de (patch) | |
tree | 5c33b8dc5000f3385161bd0742b9b71a141b0aa7 /drivers/gpu/drm/etnaviv/etnaviv_drv.h | |
parent | Merge branch 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
parent | drm/etnaviv: initialize idle mask before querying the HW db (diff) | |
download | linux-dev-d62bef1016e944a7602d6fade214f28e1f2157de.tar.xz linux-dev-d62bef1016e944a7602d6fade214f28e1f2157de.zip |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
things are still slow in etnaviv land, so we don't have anything major
to destage. Just a couple of non-critical fixes that I want to land in
5.2.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1556874643.2590.15.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, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.h b/drivers/gpu/drm/etnaviv/etnaviv_drv.h index 6044ace6bb3e..8798423705e1 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.h +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.h @@ -42,6 +42,7 @@ struct etnaviv_file_private { struct etnaviv_drm_private { int num_gpus; + struct device_dma_parameters dma_parms; struct etnaviv_gpu *gpu[ETNA_MAX_PIPES]; /* list of GEM objects: */ |