On Sun, Jun 30, 2019 at 3:19 AM Sam Ravnborg <sam@xxxxxxxxxxxx> wrote: > > Drop use of the deprecated drmP.h header. > Replace it with the necessary includes in the individual .c files. > The header files was self-contained, and extra includes were not added > there. > > Signed-off-by: Sam Ravnborg <sam@xxxxxxxxxxxx> > Cc: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx> > Cc: Haneen Mohammed <hamohammed.sa@xxxxxxxxx> > Cc: Daniel Vetter <daniel@xxxxxxxx> > Cc: David Airlie <airlied@xxxxxxxx> Hi Sam, Thanks for you patch, it LGTM. Reviewed-by: Rodrigo Siqueira <rodrigosiqueiramelo@xxxxxxxxx> > --- > 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 > > drivers/gpu/drm/vkms/vkms_crc.c | 5 ++++- > drivers/gpu/drm/vkms/vkms_crtc.c | 4 +++- > drivers/gpu/drm/vkms/vkms_drv.c | 11 +++++++++-- > drivers/gpu/drm/vkms/vkms_drv.h | 4 ++-- > drivers/gpu/drm/vkms/vkms_gem.c | 1 + > drivers/gpu/drm/vkms/vkms_plane.c | 6 ++++-- > 6 files changed, 23 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_crc.c b/drivers/gpu/drm/vkms/vkms_crc.c > index 30b048b67a32..2037e5669fcf 100644 > --- a/drivers/gpu/drm/vkms/vkms_crc.c > +++ b/drivers/gpu/drm/vkms/vkms_crc.c > @@ -1,10 +1,13 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include "vkms_drv.h" > #include <linux/crc32.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_vblank.h> > + > +#include "vkms_drv.h" > > /** > * compute_crc - Compute CRC value on output frame > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c > index 7e2a081f3764..8e9cc35c16d3 100644 > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > @@ -1,9 +1,11 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include "vkms_drv.h" > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > + > +#include "vkms_drv.h" > > static enum hrtimer_restart vkms_vblank_simulate(struct hrtimer *timer) > { > diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c > index cc53ef88a331..0a236160b235 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.c > +++ b/drivers/gpu/drm/vkms/vkms_drv.c > @@ -10,12 +10,19 @@ > */ > > #include <linux/module.h> > -#include <drm/drm_gem.h> > +#include <linux/platform_device.h> > + > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > -#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_drv.h> > #include <drm/drm_fb_helper.h> > +#include <drm/drm_file.h> > +#include <drm/drm_gem.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_ioctl.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > + > #include "vkms_drv.h" > > #define DRIVER_NAME "vkms" > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index 12b4db7ac641..0a4ba8b57e11 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.h > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > @@ -3,11 +3,11 @@ > #ifndef _VKMS_DRV_H_ > #define _VKMS_DRV_H_ > > -#include <drm/drmP.h> > +#include <linux/hrtimer.h> > + > #include <drm/drm.h> > #include <drm/drm_gem.h> > #include <drm/drm_encoder.h> > -#include <linux/hrtimer.h> > > #define XRES_MIN 20 > #define YRES_MIN 20 > diff --git a/drivers/gpu/drm/vkms/vkms_gem.c b/drivers/gpu/drm/vkms/vkms_gem.c > index 69048e73377d..6489bfe0a149 100644 > --- a/drivers/gpu/drm/vkms/vkms_gem.c > +++ b/drivers/gpu/drm/vkms/vkms_gem.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0+ > > #include <linux/shmem_fs.h> > +#include <linux/vmalloc.h> > > #include "vkms_drv.h" > > diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c > index 0fceb6258422..3a610b4060c1 100644 > --- a/drivers/gpu/drm/vkms/vkms_plane.c > +++ b/drivers/gpu/drm/vkms/vkms_plane.c > @@ -1,10 +1,12 @@ > // SPDX-License-Identifier: GPL-2.0+ > > -#include "vkms_drv.h" > -#include <drm/drm_plane_helper.h> > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_plane_helper.h> > + > +#include "vkms_drv.h" > > static const u32 vkms_formats[] = { > DRM_FORMAT_XRGB8888, > -- > 2.20.1 > -- Rodrigo Siqueira https://siqueira.tech _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
