diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-08-18 06:41:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-08-18 06:42:12 +1000 |
| commit | bd23a6ac53372251a7ff2655def09b4a84cfd227 (patch) | |
| tree | 26db770be561bc230dfe27f697f4565296e16fa5 /drivers/gpu/drm/etnaviv/etnaviv_drv.c | |
| parent | a8b273a8fd9c88cee038ffdae05b7eca063b9622 (diff) | |
| parent | 88c31d2dd191ab78e9ba9ff967845018aa7ee214 (diff) | |
Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux into drm-next
This time mostly cleanups around the runtime power management handling
and slightly improved GPU hang handling. Also some additions to the
HWDB to get the driver working properly on more NXP i.MX8MP IP cores.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Lucas Stach <l.stach@pengutronix.de>
Link: https://patchwork.freedesktop.org/patch/msgid/f40c65f7ecfde2e61f1a6d7fd463f6f739bc0dd1.camel@pengutronix.de
Diffstat (limited to 'drivers/gpu/drm/etnaviv/etnaviv_drv.c')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c index ea55f6b7b744..a8d3fa81e4ec 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c @@ -6,7 +6,9 @@ #include <linux/component.h> #include <linux/dma-mapping.h> #include <linux/module.h> -#include <linux/of_platform.h> +#include <linux/of.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> #include <linux/uaccess.h> #include <drm/drm_debugfs.h> |