| Message ID | 20190803145735.GA28393@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1,1/1] drm/exynos: drop use of drmP.h (2nd round) | expand |
Hi Inki. Any plans to take this to the exynos tree? Sam On Sat, Aug 03, 2019 at 04:57:35PM +0200, Sam Ravnborg wrote: > There was a few uses of drmP that was missed in the last > patch removing this header from exynos. > > Remove the final uses of this header. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Inki Dae <inki.dae@samsung.com> > Cc: Joonyoung Shim <jy0922.shim@samsung.com> > Cc: Seung-Woo Kim <sw0312.kim@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: Kukjin Kim <kgene@kernel.org> > Cc: Krzysztof Kozlowski <krzk@kernel.org> > Cc: Jingoo Han <jingoohan1@gmail.com> > --- > drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 ++++++++ > drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 ++ > drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 ++ > drivers/gpu/drm/exynos/exynos_drm_ipp.c | 5 ++++- > drivers/gpu/drm/exynos/exynos_drm_ipp.h | 2 -- > drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++ > drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + > 7 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c > index cc53dcad25e4..8a03a33c32cb 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c > @@ -8,12 +8,20 @@ > */ > > #include <linux/component.h> > +#include <linux/dma-mapping.h> > +#include <linux/platform_device.h> > #include <linux/pm_runtime.h> > +#include <linux/uaccess.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_file.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_ioctl.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > #include <drm/exynos_drm.h> > > #include "exynos_drm_drv.h" > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c > index a594ab7be2c0..5cf0ed0d714c 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c > @@ -17,6 +17,8 @@ > #include <linux/regmap.h> > #include <linux/spinlock.h> > > +#include <drm/drm_fourcc.h> > +#include <drm/drm_print.h> > #include <drm/exynos_drm.h> > > #include "exynos_drm_drv.h" > diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c > index 1e4b21c49a06..a0fc9a2a58f6 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c > @@ -16,6 +16,8 @@ > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > > +#include <drm/drm_fourcc.h> > +#include <drm/drm_print.h> > #include <drm/exynos_drm.h> > > #include "exynos_drm_drv.h" > diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c > index d45bfab6fe40..4f2b7551b251 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c > @@ -16,7 +16,10 @@ > * all copies or substantial portions of the Software. > */ > > -#include <drm/drmP.h> > +#include <linux/uaccess.h> > + > +#include <drm/drm_file.h> > +#include <drm/drm_fourcc.h> > #include <drm/drm_mode.h> > #include <drm/exynos_drm.h> > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h > index 9cbbc301bec9..67a0805ee009 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h > +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h > @@ -6,8 +6,6 @@ > #ifndef _EXYNOS_DRM_IPP_H_ > #define _EXYNOS_DRM_IPP_H_ > > -#include <drm/drmP.h> > - > struct exynos_drm_ipp; > struct exynos_drm_ipp_task; > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c > index 8ebad2740ad5..b98482990d1a 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c > @@ -15,7 +15,9 @@ > #include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > +#include <linux/sizes.h> > > +#include <drm/drm_fourcc.h> > #include <drm/exynos_drm.h> > > #include "exynos_drm_drv.h" > diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c > index 9af096479e1c..f082f259ca6d 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c > @@ -15,6 +15,7 @@ > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > > +#include <drm/drm_fourcc.h> > #include <drm/exynos_drm.h> > > #include "exynos_drm_drv.h" > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Inki. On Tue, Aug 13, 2019 at 10:03:51PM +0900, Inki Dae wrote: > Hi, > > On 19. 8. 13. 오전 3:51, Sam Ravnborg wrote: > > Hi Inki. > > > > Any plans to take this to the exynos tree? > > > > It will be merged to next. Thanks, one more off the list. Sam
Hi, On 19. 8. 13. 오전 3:51, Sam Ravnborg wrote: > Hi Inki. > > Any plans to take this to the exynos tree? > It will be merged to next. Thanks, Inki Dae > Sam > > On Sat, Aug 03, 2019 at 04:57:35PM +0200, Sam Ravnborg wrote: >> There was a few uses of drmP that was missed in the last >> patch removing this header from exynos. >> >> Remove the final uses of this header. >> >> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> >> Cc: Inki Dae <inki.dae@samsung.com> >> Cc: Joonyoung Shim <jy0922.shim@samsung.com> >> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> >> Cc: Kyungmin Park <kyungmin.park@samsung.com> >> Cc: David Airlie <airlied@linux.ie> >> Cc: Daniel Vetter <daniel@ffwll.ch> >> Cc: Kukjin Kim <kgene@kernel.org> >> Cc: Krzysztof Kozlowski <krzk@kernel.org> >> Cc: Jingoo Han <jingoohan1@gmail.com> >> --- >> drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 ++++++++ >> drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 ++ >> drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 ++ >> drivers/gpu/drm/exynos/exynos_drm_ipp.c | 5 ++++- >> drivers/gpu/drm/exynos/exynos_drm_ipp.h | 2 -- >> drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++ >> drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + >> 7 files changed, 19 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c >> index cc53dcad25e4..8a03a33c32cb 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c >> @@ -8,12 +8,20 @@ >> */ >> >> #include <linux/component.h> >> +#include <linux/dma-mapping.h> >> +#include <linux/platform_device.h> >> #include <linux/pm_runtime.h> >> +#include <linux/uaccess.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_file.h> >> +#include <drm/drm_fourcc.h> >> +#include <drm/drm_ioctl.h> >> #include <drm/drm_probe_helper.h> >> +#include <drm/drm_vblank.h> >> #include <drm/exynos_drm.h> >> >> #include "exynos_drm_drv.h" >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c >> index a594ab7be2c0..5cf0ed0d714c 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c >> @@ -17,6 +17,8 @@ >> #include <linux/regmap.h> >> #include <linux/spinlock.h> >> >> +#include <drm/drm_fourcc.h> >> +#include <drm/drm_print.h> >> #include <drm/exynos_drm.h> >> >> #include "exynos_drm_drv.h" >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c >> index 1e4b21c49a06..a0fc9a2a58f6 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c >> @@ -16,6 +16,8 @@ >> #include <linux/pm_runtime.h> >> #include <linux/regmap.h> >> >> +#include <drm/drm_fourcc.h> >> +#include <drm/drm_print.h> >> #include <drm/exynos_drm.h> >> >> #include "exynos_drm_drv.h" >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c >> index d45bfab6fe40..4f2b7551b251 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c >> @@ -16,7 +16,10 @@ >> * all copies or substantial portions of the Software. >> */ >> >> -#include <drm/drmP.h> >> +#include <linux/uaccess.h> >> + >> +#include <drm/drm_file.h> >> +#include <drm/drm_fourcc.h> >> #include <drm/drm_mode.h> >> #include <drm/exynos_drm.h> >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h >> index 9cbbc301bec9..67a0805ee009 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h >> +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h >> @@ -6,8 +6,6 @@ >> #ifndef _EXYNOS_DRM_IPP_H_ >> #define _EXYNOS_DRM_IPP_H_ >> >> -#include <drm/drmP.h> >> - >> struct exynos_drm_ipp; >> struct exynos_drm_ipp_task; >> >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c >> index 8ebad2740ad5..b98482990d1a 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c >> @@ -15,7 +15,9 @@ >> #include <linux/of_device.h> >> #include <linux/platform_device.h> >> #include <linux/pm_runtime.h> >> +#include <linux/sizes.h> >> >> +#include <drm/drm_fourcc.h> >> #include <drm/exynos_drm.h> >> >> #include "exynos_drm_drv.h" >> diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c >> index 9af096479e1c..f082f259ca6d 100644 >> --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c >> +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c >> @@ -15,6 +15,7 @@ >> #include <linux/platform_device.h> >> #include <linux/pm_runtime.h> >> >> +#include <drm/drm_fourcc.h> >> #include <drm/exynos_drm.h> >> >> #include "exynos_drm_drv.h" >> -- >> 2.20.1 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index cc53dcad25e4..8a03a33c32cb 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -8,12 +8,20 @@ */ #include <linux/component.h> +#include <linux/dma-mapping.h> +#include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/uaccess.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_file.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_ioctl.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h" diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c index a594ab7be2c0..5cf0ed0d714c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c @@ -17,6 +17,8 @@ #include <linux/regmap.h> #include <linux/spinlock.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h" diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c index 1e4b21c49a06..a0fc9a2a58f6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c @@ -16,6 +16,8 @@ #include <linux/pm_runtime.h> #include <linux/regmap.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_print.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h" diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c index d45bfab6fe40..4f2b7551b251 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c @@ -16,7 +16,10 @@ * all copies or substantial portions of the Software. */ -#include <drm/drmP.h> +#include <linux/uaccess.h> + +#include <drm/drm_file.h> +#include <drm/drm_fourcc.h> #include <drm/drm_mode.h> #include <drm/exynos_drm.h> diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h index 9cbbc301bec9..67a0805ee009 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h +++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h @@ -6,8 +6,6 @@ #ifndef _EXYNOS_DRM_IPP_H_ #define _EXYNOS_DRM_IPP_H_ -#include <drm/drmP.h> - struct exynos_drm_ipp; struct exynos_drm_ipp_task; diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index 8ebad2740ad5..b98482990d1a 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c @@ -15,7 +15,9 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <linux/sizes.h> +#include <drm/drm_fourcc.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h" diff --git a/drivers/gpu/drm/exynos/exynos_drm_scaler.c b/drivers/gpu/drm/exynos/exynos_drm_scaler.c index 9af096479e1c..f082f259ca6d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_scaler.c +++ b/drivers/gpu/drm/exynos/exynos_drm_scaler.c @@ -15,6 +15,7 @@ #include <linux/platform_device.h> #include <linux/pm_runtime.h> +#include <drm/drm_fourcc.h> #include <drm/exynos_drm.h> #include "exynos_drm_drv.h"
There was a few uses of drmP that was missed in the last patch removing this header from exynos. Remove the final uses of this header. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Inki Dae <inki.dae@samsung.com> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Cc: Seung-Woo Kim <sw0312.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Kukjin Kim <kgene@kernel.org> Cc: Krzysztof Kozlowski <krzk@kernel.org> Cc: Jingoo Han <jingoohan1@gmail.com> --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 ++++++++ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 ++ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 2 ++ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 5 ++++- drivers/gpu/drm/exynos/exynos_drm_ipp.h | 2 -- drivers/gpu/drm/exynos/exynos_drm_rotator.c | 2 ++ drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 + 7 files changed, 19 insertions(+), 3 deletions(-)