diff options
| author | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-10-03 17:04:02 +0100 |
|---|---|---|
| committer | Tvrtko Ursulin <tvrtko.ursulin@intel.com> | 2022-10-03 17:04:02 +0100 |
| commit | 97acb6a8fcc4e5c2cdc2693a35acdc5a7461aaa3 (patch) | |
| tree | c4f1a18b38d655b7806a72515992bd9aae14ef53 /drivers/gpu/drm/imx/parallel-display.c | |
| parent | 6fa964c045a6bc3321a9186e87bfbcfd1059b0f1 (diff) | |
| parent | 7860d720a84c74b2761c6b7995392a798ab0a3cb (diff) | |
Merge drm/drm-next into drm-intel-gt-next
Daniele needs 84d4333c1e28 ("misc/mei: Add NULL check to component match
callback functions") in order to merge the DG2 HuC patches.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Diffstat (limited to 'drivers/gpu/drm/imx/parallel-display.c')
| -rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index 63ba2ad84679..06723b2e9b84 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -6,6 +6,7 @@ */ #include <linux/component.h> +#include <linux/media-bus-format.h> #include <linux/module.h> #include <linux/platform_device.h> #include <linux/videodev2.h> @@ -14,6 +15,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_bridge.h> +#include <drm/drm_edid.h> #include <drm/drm_fb_helper.h> #include <drm/drm_managed.h> #include <drm/drm_of.h> |