diff options
author | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
commit | b24fdd4b3830f77ff71c09eaec6a617e88abe419 (patch) | |
tree | 123628b3c27646c5ae7dbbdf3ad7e4a041f75916 /drivers/gpu/drm/msm/dp/dp_drm.h | |
parent | 029f56db6ac248769f2c260bfaf3c3c0e23e904c (diff) | |
parent | 640eee067d9aae0bb98d8706001976ff1affaf00 (diff) |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.10-merged
Conflict resolution temp branch
Diffstat (limited to 'drivers/gpu/drm/msm/dp/dp_drm.h')
-rw-r--r-- | drivers/gpu/drm/msm/dp/dp_drm.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/dp/dp_drm.h b/drivers/gpu/drm/msm/dp/dp_drm.h new file mode 100644 index 000000000000..c27bfceefdf0 --- /dev/null +++ b/drivers/gpu/drm/msm/dp/dp_drm.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved. + */ + +#ifndef _DP_DRM_H_ +#define _DP_DRM_H_ + +#include <linux/types.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> + +#include "msm_drv.h" +#include "dp_display.h" + +struct drm_connector *dp_drm_connector_init(struct msm_dp *dp_display); + +#endif /* _DP_DRM_H_ */ |