Hi Sam, Thank you for the patch. On Sun, Jun 30, 2019 at 07:21:26AM +0200, Sam Ravnborg wrote: > Drop use of the deprecated drmP.h header file. > Fix fallout. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > Cc: Kieran Bingham <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: linux-renesas-soc@xxxxxxxxxxxxxxx > --- > The patch is build tested using several configs and > several architectures (including arm, arm64, x86). > > The patch is based on drm-misc. > > If patch is OK, please apply to your tree > as this driver is maintained outside drm-misc. > > I am happy to rebase on another tree, just let me know. The shmobile driver hasn't seen changes for a long time and I don't have patches queued in my tree for it. If you don't mind taking this patch through drm-misc with the rest of the drmP.h removal series it would be easier for me. Otherwise please let me know and I'll handle it. > drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 ++- > drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - > drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +++- > drivers/gpu/drm/shmobile/shmob_drm_kms.c | 1 - > drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 +- > 5 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > index b6988a6d698e..75a752d59ef1 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.c > @@ -10,13 +10,14 @@ > #include <linux/backlight.h> > #include <linux/clk.h> > > -#include <drm/drmP.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_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 <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > #include "shmob_drm_backlight.h" > #include "shmob_drm_crtc.h" > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_crtc.h b/drivers/gpu/drm/shmobile/shmob_drm_crtc.h > index 9ca6920641d8..bd35fe8f9028 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_crtc.h > +++ b/drivers/gpu/drm/shmobile/shmob_drm_crtc.h > @@ -10,7 +10,6 @@ > #ifndef __SHMOB_DRM_CRTC_H__ > #define __SHMOB_DRM_CRTC_H__ > > -#include <drm/drmP.h> I think you should include drm/drm_connector.h here. It gets pulled indirectly, but it's one of the top-level headers and I think it should be explicitly included to avoid future breakages. While at it a forward declaration of struct drm_pending_vblank_event and struct shmob_drm_format_info could also be useful to make the header self-contained. Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> > #include <drm/drm_crtc.h> > #include <drm/drm_encoder.h> > > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > index 6c106b7a3bfe..b8c0930959c7 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c > @@ -15,10 +15,12 @@ > #include <linux/pm.h> > #include <linux/slab.h> > > -#include <drm/drmP.h> > #include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > #include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_irq.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > > #include "shmob_drm_drv.h" > #include "shmob_drm_kms.h" > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_kms.c b/drivers/gpu/drm/shmobile/shmob_drm_kms.c > index 2e08bc203bf9..c51197b6fd85 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_kms.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_kms.c > @@ -7,7 +7,6 @@ > * Laurent Pinchart (laurent.pinchart@xxxxxxxxxxxxxxxx) > */ > > -#include <drm/drmP.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_cma_helper.h> > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > index 1d1ee5e51351..cbc464f006b4 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > @@ -7,10 +7,10 @@ > * Laurent Pinchart (laurent.pinchart@xxxxxxxxxxxxxxxx) > */ > > -#include <drm/drmP.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem_cma_helper.h> > > #include "shmob_drm_drv.h" -- Regards, Laurent Pinchart
