Re: [d-kernel] [PATCH 00/12] *** Enable v3d on Raspberry Pi 4 for kernel 5.10 std-def ***

[Vitaly Chikunov <vt@altlinux.org>]

On Wed, Mar 23, 2022 at 12:17:07AM +0700, Антон Мидюков wrote:
> 23.03.2022 00:14, Vitaly Chikunov пишет:
> > On Tue, Mar 22, 2022 at 11:39:37PM +0700, Антон Мидюков wrote:
> >> 22.03.2022 23:24, Vitaly Chikunov пишет:
> >>> On Tue, Mar 22, 2022 at 10:36:03PM +0700, antohami@basealt.ru wrote:
> >>>> From: Anton Midyukov <antohami@altlinux.org>
> >>>>
> >>>> *** These commits from https://github.com/vianpl/linux/tree/v3d-enable-v3 ***
> >>>>
> >>>> Nicolas Saenz Julienne (12):
> >>>>   dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema
> >>>>   dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names
> >>>>   dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711
> >>>>   ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node
> >>>>   ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node
> >>>>   mfd: bcm2835-pm: Use 'reg-names' to get resources
> >>>>   mfd: bcm2835-pm: Add support for BCM2711
> >>>>   soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB
> >>>>   soc: bcm: bcm2835-power: Bypass power_on/off() calls
> >>>>   drm/v3d: Get rid of pm code
> >>>>   drm/v3d: Add support for bcm2711
> >>>>   ARM: dts: bcm2711: Enable V3D
> >>>
> >>> Патчи не прикладываются - как это понимать?
> >>
> >> На ветку std-def-5.10 у меня прикладываются:
> >> https://git.altlinux.org/people/kernelbot/packages/?p=kernel-image.git;a=shortlog;h=refs/heads/std-def-5.10
> > 
> > А так это для p10.
> > 
> 
> Да. Но нужно, чтобы попало и в c9f2.

Полезная информация.

> Оно с этой же ветки собирается? Или другой?
> 
> >>
> >>>
> >>>   kernel-image (std-def/sisyphus)$ git am ./20220322_antohami__enable_v3d_on_raspberry_pi_4_for_kernel_5_10_std_def.mbx
> >>>   Applying: dt-bindings: soc: bcm: bcm2835-pm: Convert bindings to DT schema
> >>>   .git/rebase-apply/patch:139: space before tab in indent.
> >>> 		   <&clocks BCM2835_CLOCK_PERI_IMAGE>,
> >>>   .git/rebase-apply/patch:140: space before tab in indent.
> >>> 		   <&clocks BCM2835_CLOCK_H264>,
> >>>   .git/rebase-apply/patch:141: space before tab in indent.
> >>> 		   <&clocks BCM2835_CLOCK_ISP>;
> >>>   warning: 3 lines add whitespace errors.
> >>>   Applying: dt-bindings: soc: bcm: bcm2835-pm: Introduce reg-names
> >>>   Applying: dt-bindings: soc: bcm: bcm2835-pm: Add support for bcm2711
> >>>   Applying: ARM: dts: bcm2835/bcm2711: Introduce reg-names in watchdog node
> >>>   Applying: ARM: dts: bcm2711: Use proper compatible in PM/Watchdog node
> >>>   Applying: mfd: bcm2835-pm: Use 'reg-names' to get resources
> >>>   Applying: mfd: bcm2835-pm: Add support for BCM2711
> >>>   Applying: soc: bcm: bcm2835-power: Add support for BCM2711's RPiVid ASB
> >>>   Applying: soc: bcm: bcm2835-power: Bypass power_on/off() calls
> >>>   Applying: drm/v3d: Get rid of pm code
> >>>   error: patch failed: drivers/gpu/drm/v3d/v3d_gem.c:370
> >>>   error: drivers/gpu/drm/v3d/v3d_gem.c: patch does not apply
> >>>   Patch failed at 0010 drm/v3d: Get rid of pm code
> >>>   hint: Use 'git am --show-current-patch=diff' to see the failed patch
> >>>   When you have resolved this problem, run "git am --continue".
> >>>   If you prefer to skip this patch, run "git am --skip" instead.
> >>>   To restore the original branch and stop patching, run "git am --abort".
> >>>
> >>>
> >>>>
> >>>>  .../bindings/soc/bcm/brcm,bcm2835-pm.txt      | 46 ----------
> >>>>  .../bindings/soc/bcm/brcm,bcm2835-pm.yaml     | 87 +++++++++++++++++++
> >>>>  arch/arm/boot/dts/bcm2711.dtsi                | 15 +++-
> >>>>  arch/arm/boot/dts/bcm2835-common.dtsi         |  1 +
> >>>>  drivers/gpu/drm/v3d/Kconfig                   |  2 +-
> >>>>  drivers/gpu/drm/v3d/v3d_debugfs.c             | 18 +---
> >>>>  drivers/gpu/drm/v3d/v3d_drv.c                 | 12 +--
> >>>>  drivers/gpu/drm/v3d/v3d_gem.c                 |  9 --
> >>>>  drivers/mfd/bcm2835-pm.c                      | 80 ++++++++++++-----
> >>>>  drivers/soc/bcm/bcm2835-power.c               | 74 ++++++++++------
> >>>>  include/linux/mfd/bcm2835-pm.h                |  1 +
> >>>>  11 files changed, 214 insertions(+), 131 deletions(-)
> >>>>  delete mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
> >>>>  create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.yaml
> >>>>
> >>>> -- 
> >>>> 2.33.0
> >>>>
> >>>> _______________________________________________
> >>>> devel-kernel mailing list
> >>>> devel-kernel@lists.altlinux.org
> >>>> https://lists.altlinux.org/mailman/listinfo/devel-kernel
> >>> _______________________________________________
> >>> devel-kernel mailing list
> >>> devel-kernel@lists.altlinux.org
> >>> https://lists.altlinux.org/mailman/listinfo/devel-kernel
> >>
> >>
> >> -- 
> >> С уважением, Антон Мидюков <antohami@basealt.ru>
> >> _______________________________________________
> >> devel-kernel mailing list
> >> devel-kernel@lists.altlinux.org
> >> https://lists.altlinux.org/mailman/listinfo/devel-kernel
> > _______________________________________________
> > devel-kernel mailing list
> > devel-kernel@lists.altlinux.org
> > https://lists.altlinux.org/mailman/listinfo/devel-kernel
> 
> 
> -- 
> С уважением, Антон Мидюков <antohami@basealt.ru>
> _______________________________________________
> devel-kernel mailing list
> devel-kernel@lists.altlinux.org
> https://lists.altlinux.org/mailman/listinfo/devel-kernel