[PATCH 10/15] drm: drop drmP.h include from drm_plane.c
Sean Paul
seanpaul at chromium.org
Fri Jul 13 15:22:15 UTC 2018
On Mon, Jul 09, 2018 at 10:40:11AM +0200, Daniel Vetter wrote:
> Just a bit of missing includes and pre declarations.
>
> Note: This needs the patch to move for_each_if from drmP.h to kernel.h
> or it won't compile.
>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
Reviewed-by: Sean Paul <seanpaul at chromium.org>
> ---
> drivers/gpu/drm/drm_crtc_internal.h | 8 ++++++++
> drivers/gpu/drm/drm_plane.c | 11 ++++++++++-
> include/drm/drm_color_mgmt.h | 1 +
> include/drm/drm_plane.h | 2 ++
> include/drm/drm_property.h | 2 ++
> 5 files changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index b61322763394..ff5e0d521c21 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -31,6 +31,14 @@
> * and are not exported to drivers.
> */
>
> +enum drm_mode_status;
> +enum drm_connector_force;
> +
> +struct drm_display_mode;
> +struct work_struct;
> +struct drm_connector;
> +struct drm_bridge;
> +struct edid;
>
> /* drm_crtc.c */
> int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
> diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c
> index df0b4ebbedbf..a26a1b6c8f6a 100644
> --- a/drivers/gpu/drm/drm_plane.c
> +++ b/drivers/gpu/drm/drm_plane.c
> @@ -20,8 +20,17 @@
> * OF THIS SOFTWARE.
> */
>
> -#include <drm/drmP.h>
> +#include <linux/slab.h>
> +#include <linux/uaccess.h>
> +
> #include <drm/drm_plane.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_print.h>
> +#include <drm/drm_framebuffer.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_fourcc.h>
> +#include <drm/drm_vblank.h>
>
> #include "drm_crtc_internal.h"
>
> diff --git a/include/drm/drm_color_mgmt.h b/include/drm/drm_color_mgmt.h
> index 44f04233e3db..90ef9996d9a4 100644
> --- a/include/drm/drm_color_mgmt.h
> +++ b/include/drm/drm_color_mgmt.h
> @@ -24,6 +24,7 @@
> #define __DRM_COLOR_MGMT_H__
>
> #include <linux/ctype.h>
> +#include <drm/drm_property.h>
>
> struct drm_crtc;
> struct drm_plane;
> diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h
> index 8a152dc16ea5..311c31714c15 100644
> --- a/include/drm/drm_plane.h
> +++ b/include/drm/drm_plane.h
> @@ -27,6 +27,8 @@
> #include <linux/ctype.h>
> #include <drm/drm_mode_object.h>
> #include <drm/drm_color_mgmt.h>
> +#include <drm/drm_rect.h>
> +#include <drm/drm_modeset_lock.h>
>
> struct drm_crtc;
> struct drm_printer;
> diff --git a/include/drm/drm_property.h b/include/drm/drm_property.h
> index 1d5c0b2a8956..350fb58f819c 100644
> --- a/include/drm/drm_property.h
> +++ b/include/drm/drm_property.h
> @@ -27,6 +27,8 @@
> #include <linux/ctype.h>
> #include <drm/drm_mode_object.h>
>
> +#include <uapi/drm/drm_mode.h>
> +
> /**
> * struct drm_property_enum - symbolic values for enumerations
> * @value: numeric property value for this enum entry
> --
> 2.18.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Sean Paul, Software Engineer, Google / Chromium OS
More information about the dri-devel
mailing list