| Message ID | 1495082612-10385-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, May 18, 2017 at 08:47:34AM +0200, Christian König wrote: > Am 18.05.2017 um 06:43 schrieb Masahiro Yamada: > > Use <...> notation to include headers located in include/linux. > > While we are here, tweak the includes order a bit to sort them > > alphabetically. > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > Reviewed-by: Christian König <christian.koenig@amd.com> I think I'll leave this one for Alex, but I guess I can pick it up into drm-misc too if that's simpler ... All the other include patches are in there already. -Daniel > > > --- > > > > drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- > > drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- > > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- > > drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- > > drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- > > drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- > > 6 files changed, 16 insertions(+), 12 deletions(-) > > > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > index ff4ae3d..963a9e0 100644 > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > @@ -22,10 +22,10 @@ > > */ > > #include "pp_debug.h" > > -#include "linux/delay.h" > > -#include <linux/types.h> > > +#include <linux/delay.h> > > #include <linux/kernel.h> > > #include <linux/slab.h> > > +#include <linux/types.h> > > #include <drm/amdgpu_drm.h> > > #include "cgs_common.h" > > #include "power_state.h" > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > index f5e8fda..f6b4dd9 100644 > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > @@ -21,8 +21,8 @@ > > * > > */ > > +#include <linux/delay.h> > > #include <linux/errno.h> > > -#include "linux/delay.h" > > #include "hwmgr.h" > > #include "amd_acpi.h" > > #include "pp_acpi.h" > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > index 8f663ab..581374d 100644 > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > @@ -21,11 +21,11 @@ > > * > > */ > > #include "pp_debug.h" > > +#include <linux/delay.h> > > +#include <linux/fb.h> > > #include <linux/module.h> > > #include <linux/slab.h> > > -#include <linux/fb.h> > > #include <asm/div64.h> > > -#include "linux/delay.h" > > #include "pp_acpi.h" > > #include "ppatomctrl.h" > > #include "atombios.h" > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > index 8394955..f4ab81b 100644 > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > @@ -20,10 +20,11 @@ > > * OTHER DEALINGS IN THE SOFTWARE. > > * > > */ > > + > > +#include <linux/delay.h> > > +#include <linux/fb.h> > > #include <linux/module.h> > > #include <linux/slab.h> > > -#include <linux/fb.h> > > -#include "linux/delay.h" > > #include "hwmgr.h" > > #include "amd_powerplay.h" > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > index 1f6744a..39c7091 100644 > > --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > @@ -20,11 +20,13 @@ > > * OTHER DEALINGS IN THE SOFTWARE. > > * > > */ > > -#include <linux/types.h> > > + > > +#include <linux/delay.h> > > +#include <linux/gfp.h> > > #include <linux/kernel.h> > > #include <linux/slab.h> > > -#include <linux/gfp.h> > > -#include "linux/delay.h" > > +#include <linux/types.h> > > + > > #include "cgs_common.h" > > #include "smu/smu_8_0_d.h" > > #include "smu/smu_8_0_sh_mask.h" > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > index c0d7576..2e954a4 100644 > > --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > @@ -20,15 +20,16 @@ > > * OTHER DEALINGS IN THE SOFTWARE. > > * > > */ > > -#include <linux/types.h> > > + > > +#include <linux/delay.h> > > #include <linux/kernel.h> > > #include <linux/module.h> > > #include <linux/slab.h> > > +#include <linux/types.h> > > #include <drm/amdgpu_drm.h> > > #include "pp_instance.h" > > #include "smumgr.h" > > #include "cgs_common.h" > > -#include "linux/delay.h" > > MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); > > MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 22.05.2017 um 09:39 schrieb Daniel Vetter: > On Thu, May 18, 2017 at 08:47:34AM +0200, Christian König wrote: >> Am 18.05.2017 um 06:43 schrieb Masahiro Yamada: >>> Use <...> notation to include headers located in include/linux. >>> While we are here, tweak the includes order a bit to sort them >>> alphabetically. >>> >>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >> Reviewed-by: Christian König <christian.koenig@amd.com> > I think I'll leave this one for Alex, but I guess I can pick it up into > drm-misc too if that's simpler ... All the other include patches are in > there already. Please pick that up for drm-misc. Alex is on vacation this week and I already have all hands full replacing him. Christian. > -Daniel >>> --- >>> >>> drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- >>> drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- >>> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- >>> drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- >>> drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- >>> drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- >>> 6 files changed, 16 insertions(+), 12 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>> index ff4ae3d..963a9e0 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>> @@ -22,10 +22,10 @@ >>> */ >>> #include "pp_debug.h" >>> -#include "linux/delay.h" >>> -#include <linux/types.h> >>> +#include <linux/delay.h> >>> #include <linux/kernel.h> >>> #include <linux/slab.h> >>> +#include <linux/types.h> >>> #include <drm/amdgpu_drm.h> >>> #include "cgs_common.h" >>> #include "power_state.h" >>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>> index f5e8fda..f6b4dd9 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>> @@ -21,8 +21,8 @@ >>> * >>> */ >>> +#include <linux/delay.h> >>> #include <linux/errno.h> >>> -#include "linux/delay.h" >>> #include "hwmgr.h" >>> #include "amd_acpi.h" >>> #include "pp_acpi.h" >>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>> index 8f663ab..581374d 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>> @@ -21,11 +21,11 @@ >>> * >>> */ >>> #include "pp_debug.h" >>> +#include <linux/delay.h> >>> +#include <linux/fb.h> >>> #include <linux/module.h> >>> #include <linux/slab.h> >>> -#include <linux/fb.h> >>> #include <asm/div64.h> >>> -#include "linux/delay.h" >>> #include "pp_acpi.h" >>> #include "ppatomctrl.h" >>> #include "atombios.h" >>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>> index 8394955..f4ab81b 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>> @@ -20,10 +20,11 @@ >>> * OTHER DEALINGS IN THE SOFTWARE. >>> * >>> */ >>> + >>> +#include <linux/delay.h> >>> +#include <linux/fb.h> >>> #include <linux/module.h> >>> #include <linux/slab.h> >>> -#include <linux/fb.h> >>> -#include "linux/delay.h" >>> #include "hwmgr.h" >>> #include "amd_powerplay.h" >>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>> index 1f6744a..39c7091 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>> @@ -20,11 +20,13 @@ >>> * OTHER DEALINGS IN THE SOFTWARE. >>> * >>> */ >>> -#include <linux/types.h> >>> + >>> +#include <linux/delay.h> >>> +#include <linux/gfp.h> >>> #include <linux/kernel.h> >>> #include <linux/slab.h> >>> -#include <linux/gfp.h> >>> -#include "linux/delay.h" >>> +#include <linux/types.h> >>> + >>> #include "cgs_common.h" >>> #include "smu/smu_8_0_d.h" >>> #include "smu/smu_8_0_sh_mask.h" >>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>> index c0d7576..2e954a4 100644 >>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>> @@ -20,15 +20,16 @@ >>> * OTHER DEALINGS IN THE SOFTWARE. >>> * >>> */ >>> -#include <linux/types.h> >>> + >>> +#include <linux/delay.h> >>> #include <linux/kernel.h> >>> #include <linux/module.h> >>> #include <linux/slab.h> >>> +#include <linux/types.h> >>> #include <drm/amdgpu_drm.h> >>> #include "pp_instance.h" >>> #include "smumgr.h" >>> #include "cgs_common.h" >>> -#include "linux/delay.h" >>> MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); >>> MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
On Mon, May 22, 2017 at 09:55:46AM +0200, Christian König wrote: > Am 22.05.2017 um 09:39 schrieb Daniel Vetter: > > On Thu, May 18, 2017 at 08:47:34AM +0200, Christian König wrote: > > > Am 18.05.2017 um 06:43 schrieb Masahiro Yamada: > > > > Use <...> notation to include headers located in include/linux. > > > > While we are here, tweak the includes order a bit to sort them > > > > alphabetically. > > > > > > > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > > > Reviewed-by: Christian König <christian.koenig@amd.com> > > I think I'll leave this one for Alex, but I guess I can pick it up into > > drm-misc too if that's simpler ... All the other include patches are in > > there already. > > Please pick that up for drm-misc. Alex is on vacation this week and I > already have all hands full replacing him. Done. Aside: Switching to commit rights is a nice way to make maintainer vacations real smooth :-) I wanted to chat with Alex about that anyway, I guess I'll ping him when he's back. Cheers, Daniel > > Christian. > > > -Daniel > > > > --- > > > > > > > > drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- > > > > drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- > > > > drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- > > > > drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- > > > > drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- > > > > drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- > > > > 6 files changed, 16 insertions(+), 12 deletions(-) > > > > > > > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > > > index ff4ae3d..963a9e0 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > > > > @@ -22,10 +22,10 @@ > > > > */ > > > > #include "pp_debug.h" > > > > -#include "linux/delay.h" > > > > -#include <linux/types.h> > > > > +#include <linux/delay.h> > > > > #include <linux/kernel.h> > > > > #include <linux/slab.h> > > > > +#include <linux/types.h> > > > > #include <drm/amdgpu_drm.h> > > > > #include "cgs_common.h" > > > > #include "power_state.h" > > > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > > > index f5e8fda..f6b4dd9 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > > > > @@ -21,8 +21,8 @@ > > > > * > > > > */ > > > > +#include <linux/delay.h> > > > > #include <linux/errno.h> > > > > -#include "linux/delay.h" > > > > #include "hwmgr.h" > > > > #include "amd_acpi.h" > > > > #include "pp_acpi.h" > > > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > > > index 8f663ab..581374d 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > > > > @@ -21,11 +21,11 @@ > > > > * > > > > */ > > > > #include "pp_debug.h" > > > > +#include <linux/delay.h> > > > > +#include <linux/fb.h> > > > > #include <linux/module.h> > > > > #include <linux/slab.h> > > > > -#include <linux/fb.h> > > > > #include <asm/div64.h> > > > > -#include "linux/delay.h" > > > > #include "pp_acpi.h" > > > > #include "ppatomctrl.h" > > > > #include "atombios.h" > > > > diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > > > index 8394955..f4ab81b 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > > > > @@ -20,10 +20,11 @@ > > > > * OTHER DEALINGS IN THE SOFTWARE. > > > > * > > > > */ > > > > + > > > > +#include <linux/delay.h> > > > > +#include <linux/fb.h> > > > > #include <linux/module.h> > > > > #include <linux/slab.h> > > > > -#include <linux/fb.h> > > > > -#include "linux/delay.h" > > > > #include "hwmgr.h" > > > > #include "amd_powerplay.h" > > > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > > > index 1f6744a..39c7091 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > > > > @@ -20,11 +20,13 @@ > > > > * OTHER DEALINGS IN THE SOFTWARE. > > > > * > > > > */ > > > > -#include <linux/types.h> > > > > + > > > > +#include <linux/delay.h> > > > > +#include <linux/gfp.h> > > > > #include <linux/kernel.h> > > > > #include <linux/slab.h> > > > > -#include <linux/gfp.h> > > > > -#include "linux/delay.h" > > > > +#include <linux/types.h> > > > > + > > > > #include "cgs_common.h" > > > > #include "smu/smu_8_0_d.h" > > > > #include "smu/smu_8_0_sh_mask.h" > > > > diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > > > index c0d7576..2e954a4 100644 > > > > --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > > > +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > > > > @@ -20,15 +20,16 @@ > > > > * OTHER DEALINGS IN THE SOFTWARE. > > > > * > > > > */ > > > > -#include <linux/types.h> > > > > + > > > > +#include <linux/delay.h> > > > > #include <linux/kernel.h> > > > > #include <linux/module.h> > > > > #include <linux/slab.h> > > > > +#include <linux/types.h> > > > > #include <drm/amdgpu_drm.h> > > > > #include "pp_instance.h" > > > > #include "smumgr.h" > > > > #include "cgs_common.h" > > > > -#include "linux/delay.h" > > > > MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); > > > > MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); > > > > > > _______________________________________________ > > > dri-devel mailing list > > > dri-devel@lists.freedesktop.org > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 22.05.2017 um 10:06 schrieb Daniel Vetter: > On Mon, May 22, 2017 at 09:55:46AM +0200, Christian König wrote: >> Am 22.05.2017 um 09:39 schrieb Daniel Vetter: >>> On Thu, May 18, 2017 at 08:47:34AM +0200, Christian König wrote: >>>> Am 18.05.2017 um 06:43 schrieb Masahiro Yamada: >>>>> Use <...> notation to include headers located in include/linux. >>>>> While we are here, tweak the includes order a bit to sort them >>>>> alphabetically. >>>>> >>>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> >>>> Reviewed-by: Christian König <christian.koenig@amd.com> >>> I think I'll leave this one for Alex, but I guess I can pick it up into >>> drm-misc too if that's simpler ... All the other include patches are in >>> there already. >> Please pick that up for drm-misc. Alex is on vacation this week and I >> already have all hands full replacing him. > Done. Aside: Switching to commit rights is a nice way to make maintainer > vacations real smooth :-) I wanted to chat with Alex about that anyway, I > guess I'll ping him when he's back. Completely agree. One lesson learned from the past week is that Alex needs to stop using his personal repository on fdo. We were asked a couple of times if I couldn't update a branch there from different directions, which we obviously can't do. Christian. > > Cheers, Daniel > >> Christian. >> >>> -Daniel >>>>> --- >>>>> >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- >>>>> drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- >>>>> drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- >>>>> 6 files changed, 16 insertions(+), 12 deletions(-) >>>>> >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>>>> index ff4ae3d..963a9e0 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c >>>>> @@ -22,10 +22,10 @@ >>>>> */ >>>>> #include "pp_debug.h" >>>>> -#include "linux/delay.h" >>>>> -#include <linux/types.h> >>>>> +#include <linux/delay.h> >>>>> #include <linux/kernel.h> >>>>> #include <linux/slab.h> >>>>> +#include <linux/types.h> >>>>> #include <drm/amdgpu_drm.h> >>>>> #include "cgs_common.h" >>>>> #include "power_state.h" >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>>>> index f5e8fda..f6b4dd9 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c >>>>> @@ -21,8 +21,8 @@ >>>>> * >>>>> */ >>>>> +#include <linux/delay.h> >>>>> #include <linux/errno.h> >>>>> -#include "linux/delay.h" >>>>> #include "hwmgr.h" >>>>> #include "amd_acpi.h" >>>>> #include "pp_acpi.h" >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>>>> index 8f663ab..581374d 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c >>>>> @@ -21,11 +21,11 @@ >>>>> * >>>>> */ >>>>> #include "pp_debug.h" >>>>> +#include <linux/delay.h> >>>>> +#include <linux/fb.h> >>>>> #include <linux/module.h> >>>>> #include <linux/slab.h> >>>>> -#include <linux/fb.h> >>>>> #include <asm/div64.h> >>>>> -#include "linux/delay.h" >>>>> #include "pp_acpi.h" >>>>> #include "ppatomctrl.h" >>>>> #include "atombios.h" >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>>>> index 8394955..f4ab81b 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c >>>>> @@ -20,10 +20,11 @@ >>>>> * OTHER DEALINGS IN THE SOFTWARE. >>>>> * >>>>> */ >>>>> + >>>>> +#include <linux/delay.h> >>>>> +#include <linux/fb.h> >>>>> #include <linux/module.h> >>>>> #include <linux/slab.h> >>>>> -#include <linux/fb.h> >>>>> -#include "linux/delay.h" >>>>> #include "hwmgr.h" >>>>> #include "amd_powerplay.h" >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>>>> index 1f6744a..39c7091 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c >>>>> @@ -20,11 +20,13 @@ >>>>> * OTHER DEALINGS IN THE SOFTWARE. >>>>> * >>>>> */ >>>>> -#include <linux/types.h> >>>>> + >>>>> +#include <linux/delay.h> >>>>> +#include <linux/gfp.h> >>>>> #include <linux/kernel.h> >>>>> #include <linux/slab.h> >>>>> -#include <linux/gfp.h> >>>>> -#include "linux/delay.h" >>>>> +#include <linux/types.h> >>>>> + >>>>> #include "cgs_common.h" >>>>> #include "smu/smu_8_0_d.h" >>>>> #include "smu/smu_8_0_sh_mask.h" >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>>>> index c0d7576..2e954a4 100644 >>>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c >>>>> @@ -20,15 +20,16 @@ >>>>> * OTHER DEALINGS IN THE SOFTWARE. >>>>> * >>>>> */ >>>>> -#include <linux/types.h> >>>>> + >>>>> +#include <linux/delay.h> >>>>> #include <linux/kernel.h> >>>>> #include <linux/module.h> >>>>> #include <linux/slab.h> >>>>> +#include <linux/types.h> >>>>> #include <drm/amdgpu_drm.h> >>>>> #include "pp_instance.h" >>>>> #include "smumgr.h" >>>>> #include "cgs_common.h" >>>>> -#include "linux/delay.h" >>>>> MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); >>>>> MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); >>>> _______________________________________________ >>>> dri-devel mailing list >>>> dri-devel@lists.freedesktop.org >>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/dri-devel
> -----Original Message----- > From: Koenig, Christian > Sent: Monday, May 22, 2017 4:12 AM > To: Christian König; Masahiro Yamada; dri-devel@lists.freedesktop.org; > Daniel Vetter; Deucher, Alexander; Daenzer, Michel; linux- > kernel@vger.kernel.org; amd-gfx@lists.freedesktop.org > Subject: Re: [PATCH] drm/amd: include <linux/delay.h> instead of > "linux/delay.h" > > Am 22.05.2017 um 10:06 schrieb Daniel Vetter: > > On Mon, May 22, 2017 at 09:55:46AM +0200, Christian König wrote: > >> Am 22.05.2017 um 09:39 schrieb Daniel Vetter: > >>> On Thu, May 18, 2017 at 08:47:34AM +0200, Christian König wrote: > >>>> Am 18.05.2017 um 06:43 schrieb Masahiro Yamada: > >>>>> Use <...> notation to include headers located in include/linux. > >>>>> While we are here, tweak the includes order a bit to sort them > >>>>> alphabetically. > >>>>> > >>>>> Signed-off-by: Masahiro Yamada > <yamada.masahiro@socionext.com> > >>>> Reviewed-by: Christian König <christian.koenig@amd.com> > >>> I think I'll leave this one for Alex, but I guess I can pick it up into > >>> drm-misc too if that's simpler ... All the other include patches are in > >>> there already. > >> Please pick that up for drm-misc. Alex is on vacation this week and I > >> already have all hands full replacing him. > > Done. Aside: Switching to commit rights is a nice way to make maintainer > > vacations real smooth :-) I wanted to chat with Alex about that anyway, I > > guess I'll ping him when he's back. > > Completely agree. One lesson learned from the past week is that Alex > needs to stop using his personal repository on fdo. > > We were asked a couple of times if I couldn't update a branch there from > different directions, which we obviously can't do. Regardless of what tree we use for -fixes and -next pulls or who happens to be on vacation, we can still pull patches like this into our internal tree for testing and eventual integration into -fixes or -next. The same as any other patches we integrate. Alex > > Christian. > > > > > Cheers, Daniel > > > >> Christian. > >> > >>> -Daniel > >>>>> --- > >>>>> > >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- > >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- > >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- > >>>>> drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 > +++-- > >>>>> drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 > +++++--- > >>>>> drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- > >>>>> 6 files changed, 16 insertions(+), 12 deletions(-) > >>>>> > >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > >>>>> index ff4ae3d..963a9e0 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c > >>>>> @@ -22,10 +22,10 @@ > >>>>> */ > >>>>> #include "pp_debug.h" > >>>>> -#include "linux/delay.h" > >>>>> -#include <linux/types.h> > >>>>> +#include <linux/delay.h> > >>>>> #include <linux/kernel.h> > >>>>> #include <linux/slab.h> > >>>>> +#include <linux/types.h> > >>>>> #include <drm/amdgpu_drm.h> > >>>>> #include "cgs_common.h" > >>>>> #include "power_state.h" > >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > >>>>> index f5e8fda..f6b4dd9 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c > >>>>> @@ -21,8 +21,8 @@ > >>>>> * > >>>>> */ > >>>>> +#include <linux/delay.h> > >>>>> #include <linux/errno.h> > >>>>> -#include "linux/delay.h" > >>>>> #include "hwmgr.h" > >>>>> #include "amd_acpi.h" > >>>>> #include "pp_acpi.h" > >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > >>>>> index 8f663ab..581374d 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c > >>>>> @@ -21,11 +21,11 @@ > >>>>> * > >>>>> */ > >>>>> #include "pp_debug.h" > >>>>> +#include <linux/delay.h> > >>>>> +#include <linux/fb.h> > >>>>> #include <linux/module.h> > >>>>> #include <linux/slab.h> > >>>>> -#include <linux/fb.h> > >>>>> #include <asm/div64.h> > >>>>> -#include "linux/delay.h" > >>>>> #include "pp_acpi.h" > >>>>> #include "ppatomctrl.h" > >>>>> #include "atombios.h" > >>>>> diff --git > a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > >>>>> index 8394955..f4ab81b 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c > >>>>> @@ -20,10 +20,11 @@ > >>>>> * OTHER DEALINGS IN THE SOFTWARE. > >>>>> * > >>>>> */ > >>>>> + > >>>>> +#include <linux/delay.h> > >>>>> +#include <linux/fb.h> > >>>>> #include <linux/module.h> > >>>>> #include <linux/slab.h> > >>>>> -#include <linux/fb.h> > >>>>> -#include "linux/delay.h" > >>>>> #include "hwmgr.h" > >>>>> #include "amd_powerplay.h" > >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > >>>>> index 1f6744a..39c7091 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c > >>>>> @@ -20,11 +20,13 @@ > >>>>> * OTHER DEALINGS IN THE SOFTWARE. > >>>>> * > >>>>> */ > >>>>> -#include <linux/types.h> > >>>>> + > >>>>> +#include <linux/delay.h> > >>>>> +#include <linux/gfp.h> > >>>>> #include <linux/kernel.h> > >>>>> #include <linux/slab.h> > >>>>> -#include <linux/gfp.h> > >>>>> -#include "linux/delay.h" > >>>>> +#include <linux/types.h> > >>>>> + > >>>>> #include "cgs_common.h" > >>>>> #include "smu/smu_8_0_d.h" > >>>>> #include "smu/smu_8_0_sh_mask.h" > >>>>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > >>>>> index c0d7576..2e954a4 100644 > >>>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > >>>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c > >>>>> @@ -20,15 +20,16 @@ > >>>>> * OTHER DEALINGS IN THE SOFTWARE. > >>>>> * > >>>>> */ > >>>>> -#include <linux/types.h> > >>>>> + > >>>>> +#include <linux/delay.h> > >>>>> #include <linux/kernel.h> > >>>>> #include <linux/module.h> > >>>>> #include <linux/slab.h> > >>>>> +#include <linux/types.h> > >>>>> #include <drm/amdgpu_drm.h> > >>>>> #include "pp_instance.h" > >>>>> #include "smumgr.h" > >>>>> #include "cgs_common.h" > >>>>> -#include "linux/delay.h" > >>>>> MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); > >>>>> MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin"); > >>>> _______________________________________________ > >>>> dri-devel mailing list > >>>> dri-devel@lists.freedesktop.org > >>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel > >> > >> _______________________________________________ > >> dri-devel mailing list > >> dri-devel@lists.freedesktop.org > >> https://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c index ff4ae3d..963a9e0 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c @@ -22,10 +22,10 @@ */ #include "pp_debug.h" -#include "linux/delay.h" -#include <linux/types.h> +#include <linux/delay.h> #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/types.h> #include <drm/amdgpu_drm.h> #include "cgs_common.h" #include "power_state.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c index f5e8fda..f6b4dd9 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c @@ -21,8 +21,8 @@ * */ +#include <linux/delay.h> #include <linux/errno.h> -#include "linux/delay.h" #include "hwmgr.h" #include "amd_acpi.h" #include "pp_acpi.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index 8f663ab..581374d 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -21,11 +21,11 @@ * */ #include "pp_debug.h" +#include <linux/delay.h> +#include <linux/fb.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/fb.h> #include <asm/div64.h> -#include "linux/delay.h" #include "pp_acpi.h" #include "ppatomctrl.h" #include "atombios.h" diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c index 8394955..f4ab81b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c @@ -20,10 +20,11 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ + +#include <linux/delay.h> +#include <linux/fb.h> #include <linux/module.h> #include <linux/slab.h> -#include <linux/fb.h> -#include "linux/delay.h" #include "hwmgr.h" #include "amd_powerplay.h" diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c index 1f6744a..39c7091 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c @@ -20,11 +20,13 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include <linux/types.h> + +#include <linux/delay.h> +#include <linux/gfp.h> #include <linux/kernel.h> #include <linux/slab.h> -#include <linux/gfp.h> -#include "linux/delay.h" +#include <linux/types.h> + #include "cgs_common.h" #include "smu/smu_8_0_d.h" #include "smu/smu_8_0_sh_mask.h" diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c index c0d7576..2e954a4 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c @@ -20,15 +20,16 @@ * OTHER DEALINGS IN THE SOFTWARE. * */ -#include <linux/types.h> + +#include <linux/delay.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/slab.h> +#include <linux/types.h> #include <drm/amdgpu_drm.h> #include "pp_instance.h" #include "smumgr.h" #include "cgs_common.h" -#include "linux/delay.h" MODULE_FIRMWARE("amdgpu/topaz_smc.bin"); MODULE_FIRMWARE("amdgpu/topaz_k_smc.bin");
Use <...> notation to include headers located in include/linux. While we are here, tweak the includes order a bit to sort them alphabetically. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 2 +- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 4 ++-- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 5 +++-- drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 8 +++++--- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 +++-- 6 files changed, 16 insertions(+), 12 deletions(-)