| Message ID | 20190630061922.7254-34-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: drop use of drmp.h in drm-misc | expand |
On Sun, 30 Jun 2019 at 07:20, Sam Ravnborg <sam@ravnborg.org> wrote: > > Drop the deprecated drmP.h header file. > > Made the header file selfcontained, and dropped unused header files. > Fixed fallout in remaining files. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Xinliang Liu <z.liuxinliang@hisilicon.com> > Cc: Rongrong Zou <zourongrong@gmail.com> > Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> > Cc: Chen Feng <puck.chen@hisilicon.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Thomas Zimmermann <tzimmermann@suse.de> > Cc: Sam Ravnborg <sam@ravnborg.org> > Cc: Allison Randal <allison@lohutok.net> > Cc: Harry Wentland <harry.wentland@amd.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Souptick Joarder <jrdr.linux@gmail.com> > Cc: John Garry <john.garry@huawei.com> > Cc: Alex Deucher <alexander.deucher@amd.com> > Cc: "Christian König" <christian.koenig@amd.com> > Cc: Junwei Zhang <Jerry.Zhang@amd.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: Hans de Goede <hdegoede@redhat.com> > Cc: CK Hu <ck.hu@mediatek.com> > Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> > Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Cc: Jani Nikula <jani.nikula@intel.com> > Cc: Emil Velikov <emil.velikov@collabora.com> > Cc: Eric Anholt <eric@anholt.net> > Cc: "Noralf Trønnes" <noralf@tronnes.org> > --- > 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" > Speaking of long CC list, most patches are ok yet this has gone a bit crazy. How did you manage to pull such a long list? The get_maintainer.pl script shows a total of 17 for all of hibmc and kirin. Either way, since you've built-tested these (and conflicts are a matter of #include) for the lot: Acked-by: Emil Velikov <emil.velikov@collabora.com> -Emil
Hi Emil. > > --- > > 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" > > > Speaking of long CC list, most patches are ok yet this has gone a bit crazy. > How did you manage to pull such a long list? The get_maintainer.pl > script shows a total of 17 for all of hibmc and kirin. Sometimes scripts/get_maintainer.pl outputs a lot of people. Sometimes only a few. I have not looked into details why, and for this patch series I used "dim add-missing-cc" to most patches. > Either way, since you've built-tested these (and conflicts are a > matter of #include) for the lot: > Acked-by: Emil Velikov <emil.velikov@collabora.com> Just to be sure. Was this an Ack for the full series or only this patch? I started processing the patches, and the ones where I have got an explicit ack or r-b is queued already (without your ack). There are still ~20 patches without feedback in this series, and I would love to have them processed and pushed out. Sam
On 2019/07/15, Sam Ravnborg wrote: > Hi Emil. > > > > --- > > > 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" > > > > > Speaking of long CC list, most patches are ok yet this has gone a bit crazy. > > How did you manage to pull such a long list? The get_maintainer.pl > > script shows a total of 17 for all of hibmc and kirin. > > Sometimes scripts/get_maintainer.pl outputs a lot of people. > Sometimes only a few. > I have not looked into details why, and for this patch series > I used "dim add-missing-cc" to most patches. > This patch seems like a good candidate to fixup dim. Can we volunteer you for the task ;-) > > Either way, since you've built-tested these (and conflicts are a > > matter of #include) for the lot: > > Acked-by: Emil Velikov <emil.velikov@collabora.com> > Just to be sure. Was this an Ack for the full series or only this patch? > I started processing the patches, and the ones where I have got an > explicit ack or r-b is queued already (without your ack). > For the lot -> For the series. > There are still ~20 patches without feedback in this series, > and I would love to have them processed and pushed out. > Personally I'm inclined that we can push the series even with an ack-by. Any potential issues raised by a #include reshuffle would be caught by a build - which you've already done. Tl;Dr: If it were me - ship it :-P HTH Emil
On Mon, Jul 15, 2019 at 11:34:51AM +0100, Emil Velikov wrote: > On 2019/07/15, Sam Ravnborg wrote: > > Hi Emil. > > > > > > --- > > > > 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" > > > > > > > Speaking of long CC list, most patches are ok yet this has gone a bit crazy. > > > How did you manage to pull such a long list? The get_maintainer.pl > > > script shows a total of 17 for all of hibmc and kirin. > > > > Sometimes scripts/get_maintainer.pl outputs a lot of people. > > Sometimes only a few. > > I have not looked into details why, and for this patch series > > I used "dim add-missing-cc" to most patches. > > > This patch seems like a good candidate to fixup dim. Can we volunteer > you for the task ;-) Naah, it is somewhere in get_maintainers.pl and this is too much perl for my liking. > > > Either way, since you've built-tested these (and conflicts are a > > > matter of #include) for the lot: > > > Acked-by: Emil Velikov <emil.velikov@collabora.com> > > Just to be sure. Was this an Ack for the full series or only this patch? > > I started processing the patches, and the ones where I have got an > > explicit ack or r-b is queued already (without your ack). > > > For the lot -> For the series. Thanks for the feedback. For now I have added your ack on all, and pushed the ones where I had feedback from others too. Will resend the rest of the patches, because my git send-email somehow lost several recipients in first try. Sam
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 08657a3627f3..cc4c41748cfb 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -11,10 +11,16 @@ * Jianhua Li <lijianhua@huawei.com> */ +#include <linux/delay.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/drm_plane_helper.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index ce89e56937b0..ace93d8a681c 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -13,9 +13,16 @@ #include <linux/console.h> #include <linux/module.h> +#include <linux/pci.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem_vram_helper.h> +#include <drm/drm_irq.h> +#include <drm/drm_print.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> +#include <drm/drm_vram_mm_helper.h> #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h index 69348bf54a84..e58ecd7edcf8 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h @@ -14,12 +14,11 @@ #ifndef HIBMC_DRM_DRV_H #define HIBMC_DRM_DRV_H -#include <drm/drmP.h> -#include <drm/drm_atomic.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_gem.h> -#include <drm/drm_gem_vram_helper.h> -#include <drm/drm_vram_mm_helper.h> +#include <drm/drm_framebuffer.h> + +struct drm_device; +struct drm_gem_object; struct hibmc_framebuffer { struct drm_framebuffer fb; diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c index af1ea4cceffa..b4c1cea051e8 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c @@ -13,6 +13,8 @@ #include <drm/drm_crtc.h> #include <drm/drm_fb_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_gem_vram_helper.h> #include <drm/drm_probe_helper.h> #include "hibmc_drm_drv.h" diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c index 634a3bf018b2..6d98fdc06f6c 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -13,6 +13,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_print.h> #include "hibmc_drm_drv.h" #include "hibmc_drm_regs.h" diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c index 5d4a03cd7d50..cfc2faabda14 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c @@ -11,7 +11,13 @@ * Jianhua Li <lijianhua@huawei.com> */ +#include <linux/pci.h> + #include <drm/drm_atomic_helper.h> +#include <drm/drm_gem.h> +#include <drm/drm_gem_vram_helper.h> +#include <drm/drm_print.h> +#include <drm/drm_vram_mm_helper.h> #include "hibmc_drm_drv.h" diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c index 73611a92d96c..23b7e98ac869 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -17,19 +17,23 @@ #include <linux/bitops.h> #include <linux/clk.h> -#include <video/display_timing.h> #include <linux/mfd/syscon.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/reset.h> -#include <drm/drmP.h> +#include <video/display_timing.h> + #include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_crtc.h> +#include <drm/drm_drv.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 "kirin_drm_drv.h" #include "kirin_ade_reg.h" diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 6e95d3b167cc..716ee58c6c5d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -17,16 +17,19 @@ #include <linux/of_platform.h> #include <linux/component.h> +#include <linux/module.h> #include <linux/of_graph.h> +#include <linux/platform_device.h> -#include <drm/drmP.h> #include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> #include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_gem_cma_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_of.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include "kirin_drm_drv.h"
Drop the deprecated drmP.h header file. Made the header file selfcontained, and dropped unused header files. Fixed fallout in remaining files. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Xinliang Liu <z.liuxinliang@hisilicon.com> Cc: Rongrong Zou <zourongrong@gmail.com> Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com> Cc: Chen Feng <puck.chen@hisilicon.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Allison Randal <allison@lohutok.net> Cc: Harry Wentland <harry.wentland@amd.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Souptick Joarder <jrdr.linux@gmail.com> Cc: John Garry <john.garry@huawei.com> Cc: Alex Deucher <alexander.deucher@amd.com> Cc: "Christian König" <christian.koenig@amd.com> Cc: Junwei Zhang <Jerry.Zhang@amd.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Hans de Goede <hdegoede@redhat.com> Cc: CK Hu <ck.hu@mediatek.com> Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Jani Nikula <jani.nikula@intel.com> Cc: Emil Velikov <emil.velikov@collabora.com> Cc: Eric Anholt <eric@anholt.net> Cc: "Noralf Trønnes" <noralf@tronnes.org> --- 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/hisilicon/hibmc/hibmc_drm_de.c | 6 ++++++ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 7 +++++++ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 9 ++++----- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 ++ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 6 ++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 8 ++++++-- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 5 ++++- 8 files changed, 36 insertions(+), 8 deletions(-)