| Message ID | 1493009447-31524-16-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | gpu/drm: remove -Iinclude/drm compiler flags from Makefile | expand |
On Mon, Apr 24, 2017 at 01:50:33PM +0900, Masahiro Yamada wrote: > Include <drm/*.h> instead of relative path from include/drm, then > remove the -Iinclude/drm compiler flag. > > While we are here, use <...> instead of "..." for include/linux/*.h > headers too. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> This one doesn't apply anymore cleanly. Can you pls rebase onto latest linux-next? I'm going through the remaining patches, up to this all merged to drm-misc-next. Thanks, Daniel > --- > > Changes in v2: None > > drivers/gpu/drm/vc4/Makefile | 2 -- > drivers/gpu/drm/vc4/vc4_crtc.c | 14 +++++++------- > drivers/gpu/drm/vc4/vc4_dpi.c | 16 ++++++++-------- > drivers/gpu/drm/vc4/vc4_drv.c | 2 +- > drivers/gpu/drm/vc4/vc4_drv.h | 5 ++--- > drivers/gpu/drm/vc4/vc4_dsi.c | 28 ++++++++++++++-------------- > drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++---------- > drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- > drivers/gpu/drm/vc4/vc4_kms.c | 12 ++++++------ > drivers/gpu/drm/vc4/vc4_plane.c | 9 +++++---- > drivers/gpu/drm/vc4/vc4_v3d.c | 4 ++-- > 11 files changed, 56 insertions(+), 58 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile > index 61f45d1..f0efc7eb 100644 > --- a/drivers/gpu/drm/vc4/Makefile > +++ b/drivers/gpu/drm/vc4/Makefile > @@ -1,5 +1,3 @@ > -ccflags-y := -Iinclude/drm > - > # Please keep these build lists sorted! > > # core driver code > diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c > index d86c8cc..34d2e8a 100644 > --- a/drivers/gpu/drm/vc4/vc4_crtc.c > +++ b/drivers/gpu/drm/vc4/vc4_crtc.c > @@ -32,13 +32,13 @@ > * ones that set the clock. > */ > > -#include "drm_atomic.h" > -#include "drm_atomic_helper.h" > -#include "drm_crtc_helper.h" > -#include "linux/clk.h" > -#include "drm_fb_cma_helper.h" > -#include "linux/component.h" > -#include "linux/of_device.h" > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <linux/clk.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <linux/component.h> > +#include <linux/of_device.h> > #include "vc4_drv.h" > #include "vc4_regs.h" > > diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c > index c6d7039..39d6808 100644 > --- a/drivers/gpu/drm/vc4/vc4_dpi.c > +++ b/drivers/gpu/drm/vc4/vc4_dpi.c > @@ -22,14 +22,14 @@ > * ALT2 function. > */ > > -#include "drm_atomic_helper.h" > -#include "drm_crtc_helper.h" > -#include "drm_edid.h" > -#include "drm_panel.h" > -#include "linux/clk.h" > -#include "linux/component.h" > -#include "linux/of_graph.h" > -#include "linux/of_platform.h" > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_panel.h> > +#include <linux/clk.h> > +#include <linux/component.h> > +#include <linux/of_graph.h> > +#include <linux/of_platform.h> > #include "vc4_drv.h" > #include "vc4_regs.h" > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c > index 61e674b..2037a5f 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.c > +++ b/drivers/gpu/drm/vc4/vc4_drv.c > @@ -31,7 +31,7 @@ > #include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > -#include "drm_fb_cma_helper.h" > +#include <drm/drm_fb_cma_helper.h> > #include <drm/drm_fb_helper.h> > > #include "uapi/drm/vc4_drm.h" > diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h > index dffce629..ebfef52 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.h > +++ b/drivers/gpu/drm/vc4/vc4_drv.h > @@ -6,10 +6,9 @@ > * published by the Free Software Foundation. > */ > > -#include "drmP.h" > -#include "drm_gem_cma_helper.h" > - > +#include <drm/drmP.h> > #include <drm/drm_encoder.h> > +#include <drm/drm_gem_cma_helper.h> > > struct vc4_dev { > struct drm_device *dev; > diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c > index 160f981..d18c9b1 100644 > --- a/drivers/gpu/drm/vc4/vc4_dsi.c > +++ b/drivers/gpu/drm/vc4/vc4_dsi.c > @@ -29,20 +29,20 @@ > * hopefully present. > */ > > -#include "drm_atomic_helper.h" > -#include "drm_crtc_helper.h" > -#include "drm_edid.h" > -#include "drm_mipi_dsi.h" > -#include "drm_panel.h" > -#include "linux/clk.h" > -#include "linux/clk-provider.h" > -#include "linux/completion.h" > -#include "linux/component.h" > -#include "linux/dmaengine.h" > -#include "linux/i2c.h" > -#include "linux/of_address.h" > -#include "linux/of_platform.h" > -#include "linux/pm_runtime.h" > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_edid.h> > +#include <drm/drm_mipi_dsi.h> > +#include <drm/drm_panel.h> > +#include <linux/clk.h> > +#include <linux/clk-provider.h> > +#include <linux/completion.h> > +#include <linux/component.h> > +#include <linux/dmaengine.h> > +#include <linux/i2c.h> > +#include <linux/of_address.h> > +#include <linux/of_platform.h> > +#include <linux/pm_runtime.h> > #include "vc4_drv.h" > #include "vc4_regs.h" > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index e9cbe26..c91591c 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -42,16 +42,16 @@ > * encoder block has CEC support. > */ > > -#include "drm_atomic_helper.h" > -#include "drm_crtc_helper.h" > -#include "drm_edid.h" > -#include "linux/clk.h" > -#include "linux/component.h" > -#include "linux/i2c.h" > -#include "linux/of_address.h" > -#include "linux/of_gpio.h" > -#include "linux/of_platform.h" > -#include "linux/rational.h" > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_edid.h> > +#include <linux/clk.h> > +#include <linux/component.h> > +#include <linux/i2c.h> > +#include <linux/of_address.h> > +#include <linux/of_gpio.h> > +#include <linux/of_platform.h> > +#include <linux/rational.h> > #include "sound/dmaengine_pcm.h" > #include "sound/pcm_drm_eld.h" > #include "sound/pcm_params.h" > diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c > index fd421ba..2b62fc5 100644 > --- a/drivers/gpu/drm/vc4/vc4_hvs.c > +++ b/drivers/gpu/drm/vc4/vc4_hvs.c > @@ -22,7 +22,7 @@ > * each CRTC. > */ > > -#include "linux/component.h" > +#include <linux/component.h> > #include "vc4_drv.h" > #include "vc4_regs.h" > > diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c > index ad7925a..3f2e64e 100644 > --- a/drivers/gpu/drm/vc4/vc4_kms.c > +++ b/drivers/gpu/drm/vc4/vc4_kms.c > @@ -14,12 +14,12 @@ > * crtc, HDMI encoder). > */ > > -#include "drm_crtc.h" > -#include "drm_atomic.h" > -#include "drm_atomic_helper.h" > -#include "drm_crtc_helper.h" > -#include "drm_plane_helper.h" > -#include "drm_fb_cma_helper.h" > +#include <drm/drm_crtc.h> > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_plane_helper.h> > +#include <drm/drm_fb_cma_helper.h> > #include "vc4_drv.h" > > static void vc4_output_poll_changed(struct drm_device *dev) > diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c > index d34cd53..da18dec 100644 > --- a/drivers/gpu/drm/vc4/vc4_plane.c > +++ b/drivers/gpu/drm/vc4/vc4_plane.c > @@ -18,12 +18,13 @@ > * into the region of the HVS that it has allocated for us. > */ > > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_plane_helper.h> > + > #include "vc4_drv.h" > #include "vc4_regs.h" > -#include "drm_atomic.h" > -#include "drm_atomic_helper.h" > -#include "drm_fb_cma_helper.h" > -#include "drm_plane_helper.h" > > enum vc4_scaling_mode { > VC4_SCALING_NONE, > diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c > index 7cc346a..b0f223f 100644 > --- a/drivers/gpu/drm/vc4/vc4_v3d.c > +++ b/drivers/gpu/drm/vc4/vc4_v3d.c > @@ -16,8 +16,8 @@ > * this program. If not, see <http://www.gnu.org/licenses/>. > */ > > -#include "linux/component.h" > -#include "linux/pm_runtime.h" > +#include <linux/component.h> > +#include <linux/pm_runtime.h> > #include "vc4_drv.h" > #include "vc4_regs.h" > > -- > 2.7.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Hi Daniel, 2017-05-17 21:40 GMT+09:00 Daniel Vetter <daniel@ffwll.ch>: > On Mon, Apr 24, 2017 at 01:50:33PM +0900, Masahiro Yamada wrote: >> Include <drm/*.h> instead of relative path from include/drm, then >> remove the -Iinclude/drm compiler flag. >> >> While we are here, use <...> instead of "..." for include/linux/*.h >> headers too. >> >> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > This one doesn't apply anymore cleanly. Can you pls rebase onto latest > linux-next? I'm going through the remaining patches, up to this all merged > to drm-misc-next. > > Thanks, Daniel I rebased this one as you suggested and send v3 for the rest of the series. Please note I am also adding 12/16 : drm/stm: remove unneeded -Iinclude/drm compiler flag because a new user of -Iinclude/drm has appeared. Thanks! -- Best Regards Masahiro Yamada
diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile index 61f45d1..f0efc7eb 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile @@ -1,5 +1,3 @@ -ccflags-y := -Iinclude/drm - # Please keep these build lists sorted! # core driver code diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index d86c8cc..34d2e8a 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -32,13 +32,13 @@ * ones that set the clock. */ -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "linux/clk.h" -#include "drm_fb_cma_helper.h" -#include "linux/component.h" -#include "linux/of_device.h" +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <linux/clk.h> +#include <drm/drm_fb_cma_helper.h> +#include <linux/component.h> +#include <linux/of_device.h> #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c index c6d7039..39d6808 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c @@ -22,14 +22,14 @@ * ALT2 function. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "drm_panel.h" -#include "linux/clk.h" -#include "linux/component.h" -#include "linux/of_graph.h" -#include "linux/of_platform.h" +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_panel.h> +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/of_graph.h> +#include <linux/of_platform.h> #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 61e674b..2037a5f 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -31,7 +31,7 @@ #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include "drm_fb_cma_helper.h" +#include <drm/drm_fb_cma_helper.h> #include <drm/drm_fb_helper.h> #include "uapi/drm/vc4_drm.h" diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index dffce629..ebfef52 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -6,10 +6,9 @@ * published by the Free Software Foundation. */ -#include "drmP.h" -#include "drm_gem_cma_helper.h" - +#include <drm/drmP.h> #include <drm/drm_encoder.h> +#include <drm/drm_gem_cma_helper.h> struct vc4_dev { struct drm_device *dev; diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 160f981..d18c9b1 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -29,20 +29,20 @@ * hopefully present. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "drm_mipi_dsi.h" -#include "drm_panel.h" -#include "linux/clk.h" -#include "linux/clk-provider.h" -#include "linux/completion.h" -#include "linux/component.h" -#include "linux/dmaengine.h" -#include "linux/i2c.h" -#include "linux/of_address.h" -#include "linux/of_platform.h" -#include "linux/pm_runtime.h" +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <drm/drm_mipi_dsi.h> +#include <drm/drm_panel.h> +#include <linux/clk.h> +#include <linux/clk-provider.h> +#include <linux/completion.h> +#include <linux/component.h> +#include <linux/dmaengine.h> +#include <linux/i2c.h> +#include <linux/of_address.h> +#include <linux/of_platform.h> +#include <linux/pm_runtime.h> #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index e9cbe26..c91591c 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -42,16 +42,16 @@ * encoder block has CEC support. */ -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_edid.h" -#include "linux/clk.h" -#include "linux/component.h" -#include "linux/i2c.h" -#include "linux/of_address.h" -#include "linux/of_gpio.h" -#include "linux/of_platform.h" -#include "linux/rational.h" +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_edid.h> +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/i2c.h> +#include <linux/of_address.h> +#include <linux/of_gpio.h> +#include <linux/of_platform.h> +#include <linux/rational.h> #include "sound/dmaengine_pcm.h" #include "sound/pcm_drm_eld.h" #include "sound/pcm_params.h" diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index fd421ba..2b62fc5 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -22,7 +22,7 @@ * each CRTC. */ -#include "linux/component.h" +#include <linux/component.h> #include "vc4_drv.h" #include "vc4_regs.h" diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c index ad7925a..3f2e64e 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -14,12 +14,12 @@ * crtc, HDMI encoder). */ -#include "drm_crtc.h" -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_crtc_helper.h" -#include "drm_plane_helper.h" -#include "drm_fb_cma_helper.h" +#include <drm/drm_crtc.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_fb_cma_helper.h> #include "vc4_drv.h" static void vc4_output_poll_changed(struct drm_device *dev) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index d34cd53..da18dec 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -18,12 +18,13 @@ * into the region of the HVS that it has allocated for us. */ +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_plane_helper.h> + #include "vc4_drv.h" #include "vc4_regs.h" -#include "drm_atomic.h" -#include "drm_atomic_helper.h" -#include "drm_fb_cma_helper.h" -#include "drm_plane_helper.h" enum vc4_scaling_mode { VC4_SCALING_NONE, diff --git a/drivers/gpu/drm/vc4/vc4_v3d.c b/drivers/gpu/drm/vc4/vc4_v3d.c index 7cc346a..b0f223f 100644 --- a/drivers/gpu/drm/vc4/vc4_v3d.c +++ b/drivers/gpu/drm/vc4/vc4_v3d.c @@ -16,8 +16,8 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "linux/component.h" -#include "linux/pm_runtime.h" +#include <linux/component.h> +#include <linux/pm_runtime.h> #include "vc4_drv.h" #include "vc4_regs.h"
Include <drm/*.h> instead of relative path from include/drm, then remove the -Iinclude/drm compiler flag. While we are here, use <...> instead of "..." for include/linux/*.h headers too. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: None drivers/gpu/drm/vc4/Makefile | 2 -- drivers/gpu/drm/vc4/vc4_crtc.c | 14 +++++++------- drivers/gpu/drm/vc4/vc4_dpi.c | 16 ++++++++-------- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.h | 5 ++--- drivers/gpu/drm/vc4/vc4_dsi.c | 28 ++++++++++++++-------------- drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++---------- drivers/gpu/drm/vc4/vc4_hvs.c | 2 +- drivers/gpu/drm/vc4/vc4_kms.c | 12 ++++++------ drivers/gpu/drm/vc4/vc4_plane.c | 9 +++++---- drivers/gpu/drm/vc4/vc4_v3d.c | 4 ++-- 11 files changed, 56 insertions(+), 58 deletions(-) -- 2.7.4