On Tue, Jul 16, 2019 at 2:44 AM Sam Ravnborg <sam@xxxxxxxxxxxx> wrote: > > Drop use of the deprecated drmP.h header file. > Made v3d_drv.h self-contained with only sufficient > include files. > Fixed fallout in remaining files. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Acked-by: Emil Velikov <emil.velikov@xxxxxxxxxxxxx> > Cc: Eric Anholt <eric@xxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> Reviewed-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/v3d/v3d_debugfs.c | 3 ++- > drivers/gpu/drm/v3d/v3d_drv.c | 5 ++++- > drivers/gpu/drm/v3d/v3d_drv.h | 13 +++++++++++-- > drivers/gpu/drm/v3d/v3d_gem.c | 12 +++++++----- > drivers/gpu/drm/v3d/v3d_irq.c | 2 ++ > 5 files changed, 26 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c > index 78a78938e81f..9e953ce64ef7 100644 > --- a/drivers/gpu/drm/v3d/v3d_debugfs.c > +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c > @@ -6,7 +6,8 @@ > #include <linux/debugfs.h> > #include <linux/pm_runtime.h> > #include <linux/seq_file.h> > -#include <drm/drmP.h> > + > +#include <drm/drm_debugfs.h> > > #include "v3d_drv.h" > #include "v3d_regs.h" > diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c > index a1604705faee..3506ae2723ae 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.c > +++ b/drivers/gpu/drm/v3d/v3d_drv.c > @@ -14,16 +14,19 @@ > > #include <linux/clk.h> > #include <linux/device.h> > +#include <linux/dma-mapping.h> > #include <linux/io.h> > #include <linux/module.h> > #include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/reset.h> > + > +#include <drm/drm_drv.h> > #include <drm/drm_fb_cma_helper.h> > #include <drm/drm_fb_helper.h> > +#include <uapi/drm/v3d_drm.h> > > -#include "uapi/drm/v3d_drm.h" > #include "v3d_drv.h" > #include "v3d_regs.h" > > diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h > index 9aad9da1eb11..9a35c555ec52 100644 > --- a/drivers/gpu/drm/v3d/v3d_drv.h > +++ b/drivers/gpu/drm/v3d/v3d_drv.h > @@ -1,14 +1,23 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* Copyright (C) 2015-2018 Broadcom */ > > -#include <linux/mm_types.h> > -#include <drm/drmP.h> > +#include <linux/delay.h> > +#include <linux/mutex.h> > +#include <linux/spinlock_types.h> > +#include <linux/workqueue.h> > + > #include <drm/drm_encoder.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_shmem_helper.h> > #include <drm/gpu_scheduler.h> > + > #include "uapi/drm/v3d_drm.h" > > +struct clk; > +struct device; > +struct platform_device; > +struct reset_control; > + > #define GMP_GRANULARITY (128 * 1024) > > /* Enum for each of the V3D queues. */ > diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c > index 27e0f87075d9..79744137d89f 100644 > --- a/drivers/gpu/drm/v3d/v3d_gem.c > +++ b/drivers/gpu/drm/v3d/v3d_gem.c > @@ -1,17 +1,19 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* Copyright (C) 2014-2018 Broadcom */ > > -#include <drm/drmP.h> > -#include <drm/drm_syncobj.h> > +#include <linux/device.h> > +#include <linux/dma-mapping.h> > +#include <linux/io.h> > #include <linux/module.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/reset.h> > -#include <linux/device.h> > -#include <linux/io.h> > #include <linux/sched/signal.h> > +#include <linux/uaccess.h> > + > +#include <drm/drm_syncobj.h> > +#include <uapi/drm/v3d_drm.h> > > -#include "uapi/drm/v3d_drm.h" > #include "v3d_drv.h" > #include "v3d_regs.h" > #include "v3d_trace.h" > diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c > index 268d8a889ac5..662e67279a7b 100644 > --- a/drivers/gpu/drm/v3d/v3d_irq.c > +++ b/drivers/gpu/drm/v3d/v3d_irq.c > @@ -13,6 +13,8 @@ > * current job can make progress. > */ > > +#include <linux/platform_device.h> > + > #include "v3d_drv.h" > #include "v3d_regs.h" > #include "v3d_trace.h" > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
