On Sun, 30 Jun 2019 08:19:03 +0200 Sam Ravnborg <sam@xxxxxxxxxxxx> wrote: > Drop use of the deprecated header drmP.h. > Make header file self-contained, with only the required set > of include files. > And fixed fallout in remaining files. > Divide include files in blocks and sort them within each block. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Boris Brezillon <bbrezillon@xxxxxxxxxx> Reviewed-by: Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxxxxxx> > Cc: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> > Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > --- > The list of cc: was too large to add all recipients to the cover letter. > Please find cover letter here: > https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html > Search for "drm: drop use of drmp.h in drm-misc" > > Sam > > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 12 +++++++---- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 12 +++++++++++ > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 20 +++---------------- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 3 ++- > .../gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 10 ++++++++++ > 5 files changed, 35 insertions(+), 22 deletions(-) > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > index 81c50772df05..edcd0042bc9c 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c > @@ -19,15 +19,19 @@ > */ > > #include <linux/clk.h> > +#include <linux/mfd/atmel-hlcdc.h> > +#include <linux/pinctrl/consumer.h> > #include <linux/pm.h> > #include <linux/pm_runtime.h> > -#include <linux/pinctrl/consumer.h> > > +#include <video/videomode.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > #include <drm/drm_crtc.h> > +#include <drm/drm_modeset_helper_vtables.h> > #include <drm/drm_probe_helper.h> > -#include <drm/drmP.h> > - > -#include <video/videomode.h> > +#include <drm/drm_vblank.h> > > #include "atmel_hlcdc_dc.h" > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 2b794a50e7ab..891708048c8f 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -22,8 +22,20 @@ > #include <linux/clk.h> > #include <linux/irq.h> > #include <linux/irqchip.h> > +#include <linux/mfd/atmel-hlcdc.h> > #include <linux/module.h> > #include <linux/pm_runtime.h> > +#include <linux/platform_device.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_irq.h> > +#include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > #include "atmel_hlcdc_dc.h" > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h > index 0155efb9c443..b56c399f8715 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h > @@ -22,23 +22,9 @@ > #ifndef DRM_ATMEL_HLCDC_H > #define DRM_ATMEL_HLCDC_H > > -#include <linux/clk.h> > -#include <linux/dmapool.h> > -#include <linux/irqdomain.h> > -#include <linux/mfd/atmel-hlcdc.h> > -#include <linux/pwm.h> > - > -#include <drm/drm_atomic.h> > -#include <drm/drm_atomic_helper.h> > -#include <drm/drm_crtc.h> > -#include <drm/drm_probe_helper.h> > -#include <drm/drm_fb_helper.h> > -#include <drm/drm_fb_cma_helper.h> > -#include <drm/drm_gem_cma_helper.h> > -#include <drm/drm_gem_framebuffer_helper.h> > -#include <drm/drm_panel.h> > -#include <drm/drm_plane_helper.h> > -#include <drm/drmP.h> > +#include <linux/regmap.h> > + > +#include <drm/drm_plane.h> > > #define ATMEL_HLCDC_LAYER_CHER 0x0 > #define ATMEL_HLCDC_LAYER_CHDR 0x4 > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c > index f73d8a92274e..24938bd5adf6 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c > @@ -19,9 +19,10 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <linux/media-bus-format.h> > #include <linux/of_graph.h> > > -#include <drm/drmP.h> > +#include <drm/drm_encoder.h> > #include <drm/drm_of.h> > #include <drm/drm_bridge.h> > > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > index 0ee5b7a3a4b0..e66ea9f32185 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c > @@ -17,6 +17,16 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > +#include <linux/dmapool.h> > +#include <linux/mfd/atmel-hlcdc.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_plane_helper.h> > + > #include "atmel_hlcdc_dc.h" > > /** _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
