[renesas-drivers:topic/renesas-overlays 33/89] WARNING: drivers/clk/built-in.o(.text+0xaa9c): Section mismatch in reference from the function generic_fixed_clk_probe() to the function .init.text:of_fi
tree: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git topic/renesas-overlays head: 692ce4d39051a7c3f7be831fc62956c7a9876c45 commit: 775b662de839bc8ed8825a403f41dc258ba10547 [33/89] clk: add generic driver for fixed rate clock config: arm-allyesconfig (attached as .config) compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 775b662de839bc8ed8825a403f41dc258ba10547 # save the attached .config to linux build tree make.cross ARCH=arm All warnings (new ones prefixed by >>): >> WARNING: drivers/clk/built-in.o(.text+0xaa9c): Section mismatch in reference >> from the function generic_fixed_clk_probe() to the function >> .init.text:of_fixed_clk_setup() The function generic_fixed_clk_probe() references the function __init of_fixed_clk_setup(). This is often because generic_fixed_clk_probe lacks a __init annotation or the annotation of of_fixed_clk_setup is wrong. --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: The failure summary report of GEN3 for linux stable v4.9
Dear Geert Uytterhoeven, I have retested PM, recheck the PM test procedures. I am using board H3 ES1.1, procedures involving i2cset is right. With the same test procedures and setting for this version and previous version(v4.9-rc2), but the results are different. (Only U-boot versions are different for two version) I am using U-boot version(U-Boot 2015.04 (Sep 13 2016 - 11:32:36)). I attach the test log file of PM. Please have a look at the log. On 27/12/16 22:02, Geert Uytterhoeven wrote: Hi Hoan, On Tue, Dec 27, 2016 at 11:35 AM, Hoan Nguyen Anwrote: My name is Hoan from Jinzai Solution. We have tested the linux stable v4.9 for Gen3 Salvator-X (H3) So we would like to report the summary of the failure. 1 PM: It is not working, can't return to the system. NG New issue root@linaro-nano:~# echo mem > /sys/power/state [ 221.280712] PM: Syncing filesystems ... done. [ 221.286474] Freezing user space processes ... (elapsed 0.001 seconds) done. [ 221.295013] Freezing remaining freezable tasks ... (elapsed 0.001 seconds) done. [ 221.303691] Suspending console(s) (use no_console_suspend to debug) Are you using R-Car H3 ES1.0? AFAIK, tbe newer firmware supports system suspend/resume on H3 ES1.1 only, and only when following the right procedure involving i2cset. I only set the following command for test. root@linaro-nano:~# echo enabled > /sys/devices/platform/soc/e6e68000.serial/tty/ttySC1/power/wakeup root@linaro-nano:~# echo enabled > /sys/devices/platform/soc/e6e88000.serial/tty/ttySC0/power/wakeup root@linaro-nano:~# echo mem > /sys/power/state Could you please tell me more details for using i2cset?. Thanks, Jinzai Solution/Linux Team, Hoan. NOTICE: BL2: R-Car Gen3 Initial Program Loader(CA57) Rev.1.0.9 NOTICE: BL2: PRR is R-Car H3 ES1.1 NOTICE: BL2: Boot device is HyperFlash(80MHz) NOTICE: BL2: LCM state is CM NOTICE: BL2: AVS setting succeeded. DVFS_SetVID=0x52 NOTICE: BL2: DDR1600(rev.0.15) NOTICE: BL2: DRAM Split is 4ch NOTICE: BL2: QoS is default setting(rev.0.32) NOTICE: BL2: v1.1(release):3ad02ac NOTICE: BL2: Built : 11:32:54, Sep 13 2016 NOTICE: BL2: Normal boot NOTICE: BL2: dst=0xe631a208 src=0x818 len=512(0x200) NOTICE: BL2: dst=0x43f0 src=0x8180400 len=6144(0x1800) NOTICE: BL2: dst=0x4400 src=0x81c len=65536(0x1) NOTICE: BL2: dst=0x4410 src=0x820 len=524288(0x8) NOTICE: BL2: dst=0x4900 src=0x864 len=1048576(0x10) U-Boot 2015.04 (Sep 13 2016 - 11:32:36) CPU: Renesas Electronics R8A7795 rev 1.1 Board: Salvator-X I2C: ready DRAM: 3.9 GiB MMC: sh-sdhi: 0, sh-sdhi: 1, sh-sdhi: 2 In:serial Out: serial Err: serial Net: ravb Hit any key to stop autoboot: 0 ravb Waiting for PHY auto negotiation to complete.. done ravb: 100Base/Full Using ravb device TFTP from server 192.168.1.8; our IP address is 192.168.1.18 Filename 'Salvator-X/Image'. Load address: 0x5000 Loading: # # # # # # # # # # # # # # # 1 MiB/s done Bytes transferred = 14182912 (d86a00 hex) ravb:0 is connected to ravb. Reconnecting to ravb ravb Waiting for PHY auto negotiation to complete.. done ravb: 100Base/Full Using ravb device TFTP from server 192.168.1.8; our IP address is 192.168.1.18 Filename 'Salvator-X/r8a7795-salvator-x.dtb'. Load address: 0x48f0 Loading: ### 6.8 KiB/s done Bytes transferred = 35648 (8b40 hex) ## Flattened Device Tree blob at 48f0 Booting using the fdt blob at 0x48f0 Using Device Tree in place at 48f0, end 48f0bb3f Starting kernel ... [0.00] Booting Linux on physical CPU 0x0 [0.00] Linux version 4.9.0-1-g4a5b13a-dirty (hoan@HoanNa) (gcc version 4.9.2 20140904 (prerelease) (crosstool-NG l6 [0.00] Boot CPU: AArch64 Processor [411fd073] [0.00] debug: ignoring loglevel setting. [0.00] efi: Getting EFI parameters from FDT: [
[renesas-drivers:topic/renesas-overlays 33/89] ERROR: "of_fixed_clk_setup" [drivers/clk/clk-generic-fixed.ko] undefined!
tree: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git topic/renesas-overlays head: 692ce4d39051a7c3f7be831fc62956c7a9876c45 commit: 775b662de839bc8ed8825a403f41dc258ba10547 [33/89] clk: add generic driver for fixed rate clock config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout 775b662de839bc8ed8825a403f41dc258ba10547 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): >> ERROR: "of_fixed_clk_setup" [drivers/clk/clk-generic-fixed.ko] undefined! --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
Re: The failure summary report of GEN3 for linux stable v4.9
Dear Geert Uytterhoeven, (I resend my mail because of making mistake at previous mail) I have retested PM, recheck the PM test procedures. Are you using R-Car H3 ES1.0? I am using board H3 ES1.1. With the same test procedures and setting for this version and previous version(v4.9-rc2), but the results are different. (Only U-boot versions are different for two version) I am using U-boot version(U-Boot 2015.04 (Sep 13 2016 - 11:32:36)). I attach the test log file of PM. Please have a look at the log. AFAIK, tbe newer firmware supports system suspend/resume on H3 ES1.1 only, and only when following the right procedure involving i2cset. I only set the following command for test. root@linaro-nano:~# echo enabled > /sys/devices/platform/soc/e6e68000.serial/tty/ttySC1/power/wakeup root@linaro-nano:~# echo enabled > /sys/devices/platform/soc/e6e88000.serial/tty/ttySC0/power/wakeup root@linaro-nano:~# echo mem > /sys/power/state Could you please tell me more details for using i2cset?. Thanks, Jinzai Solution/Linux Team, Hoan. NOTICE: BL2: R-Car Gen3 Initial Program Loader(CA57) Rev.1.0.9 NOTICE: BL2: PRR is R-Car H3 ES1.1 NOTICE: BL2: Boot device is HyperFlash(80MHz) NOTICE: BL2: LCM state is CM NOTICE: BL2: AVS setting succeeded. DVFS_SetVID=0x52 NOTICE: BL2: DDR1600(rev.0.15) NOTICE: BL2: DRAM Split is 4ch NOTICE: BL2: QoS is default setting(rev.0.32) NOTICE: BL2: v1.1(release):3ad02ac NOTICE: BL2: Built : 11:32:54, Sep 13 2016 NOTICE: BL2: Normal boot NOTICE: BL2: dst=0xe631a208 src=0x818 len=512(0x200) NOTICE: BL2: dst=0x43f0 src=0x8180400 len=6144(0x1800) NOTICE: BL2: dst=0x4400 src=0x81c len=65536(0x1) NOTICE: BL2: dst=0x4410 src=0x820 len=524288(0x8) NOTICE: BL2: dst=0x4900 src=0x864 len=1048576(0x10) U-Boot 2015.04 (Sep 13 2016 - 11:32:36) CPU: Renesas Electronics R8A7795 rev 1.1 Board: Salvator-X I2C: ready DRAM: 3.9 GiB MMC: sh-sdhi: 0, sh-sdhi: 1, sh-sdhi: 2 In:serial Out: serial Err: serial Net: ravb Hit any key to stop autoboot: 0 ravb Waiting for PHY auto negotiation to complete.. done ravb: 100Base/Full Using ravb device TFTP from server 192.168.1.8; our IP address is 192.168.1.18 Filename 'Salvator-X/Image'. Load address: 0x5000 Loading: # # # # # # # # # # # # # # # 1 MiB/s done Bytes transferred = 14182912 (d86a00 hex) ravb:0 is connected to ravb. Reconnecting to ravb ravb Waiting for PHY auto negotiation to complete.. done ravb: 100Base/Full Using ravb device TFTP from server 192.168.1.8; our IP address is 192.168.1.18 Filename 'Salvator-X/r8a7795-salvator-x.dtb'. Load address: 0x48f0 Loading: ### 6.8 KiB/s done Bytes transferred = 35648 (8b40 hex) ## Flattened Device Tree blob at 48f0 Booting using the fdt blob at 0x48f0 Using Device Tree in place at 48f0, end 48f0bb3f Starting kernel ... [0.00] Booting Linux on physical CPU 0x0 [0.00] Linux version 4.9.0-1-g4a5b13a-dirty (hoan@HoanNa) (gcc version 4.9.2 20140904 (prerelease) (crosstool-NG l6 [0.00] Boot CPU: AArch64 Processor [411fd073] [0.00] debug: ignoring loglevel setting. [0.00] efi: Getting EFI parameters from FDT: [0.00] efi: UEFI not found. [0.00] cma: Reserved 16 MiB at 0x7f00 [0.00] On node 0 totalpages: 1015808 [0.00] DMA zone: 3584 pages used for memmap [0.00] DMA zone: 0 pages reserved [0.00] DMA zone: 229376 pages, LIFO batch:31 [0.00] Normal zone: 12288 pages used for memmap [0.00] Normal zone: 786432 pages, LIFO batch:31 [0.00] psci: probing for conduit method from DT. [0.00] psci: PSCIv1.0 detected in firmware. [0.00] psci: Using standard PSCI v0.2 function IDs [0.00] psci: Trusted OS migration not required [0.00] percpu: Embedded 21 pages/cpu
Re: [PATCH 2/2] gpio: rcar: Fine-grained Runtime PM support
On Thu, Dec 8, 2016 at 6:32 PM, Niklas Söderlundwrote: > From: Geert Uytterhoeven > > Currently gpio modules are runtime-resumed at probe time. This means the > gpio module will be active all the time (except during system suspend, > if not configured as a wake-up source). > > While an R-Car Gen2 gpio module retains pins configured for output at > the requested level while put in standby mode, gpio register cannot be > accessed while suspended. Unfortunately pm_runtime_get_sync() cannot be > called from all contexts where gpio register access is needed. Hence > move the Runtime PM handling from probe/remove time to gpio request/free > time, which is probably the best we can do. > > On r8a7791/koelsch, gpio modules 0, 1, 3, and 4 are now suspended during > normal use (gpio2 is used for LEDs and regulators, gpio5 for keys, gpio6 > for SD-Card CD & WP, gpio7 for keys and regulators). > > Signed-off-by: Geert Uytterhoeven > [Niklas: s/gpio_to_priv(chip)/gpiochip_get_data(chip)/] > Signed-off-by: Niklas Söderlund Patch applied. Yours, Linus Walleij
Re: [PATCH 1/2] gpio: rcar: set IRQ chip parent_device
On Thu, Dec 8, 2016 at 6:32 PM, Niklas Söderlundwrote: > This enables Runtime PM handling for interrupts. > > By setting the parent_device in struct irq_chip genirq will call the > pm_runtime_get/put APIs when an IRQ is requested/freed. > > Signed-off-by: Niklas Söderlund Patch applied with the ACKs. Yours, Linus Walleij
[renesas-drivers:topic/renesas-overlays 18/89] (.text+0x21): multiple definition of `of_changeset_add_property_copy'
tree: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git topic/renesas-overlays head: 692ce4d39051a7c3f7be831fc62956c7a9876c45 commit: 5350bc00df5ea64d628b596f967526641605d91b [18/89] of: changesets: Introduce changeset helper methods config: i386-tinyconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout 5350bc00df5ea64d628b596f967526641605d91b # save the attached .config to linux build tree make ARCH=i386 Note: the renesas-drivers/topic/renesas-overlays HEAD 692ce4d39051a7c3f7be831fc62956c7a9876c45 builds fine. It only hurts bisectibility. All errors (new ones prefixed by >>): init/mounts.o: In function `of_changeset_add_property_copy': >> (.text+0x21): multiple definition of `of_changeset_add_property_copy' init/main.o:main.c:(.text+0x19): first defined here init/mounts.o: In function `of_changeset_add_property_string': >> (.text+0x27): multiple definition of `of_changeset_add_property_string' init/main.o:main.c:(.text+0x1f): first defined here --- 0-DAY kernel test infrastructureOpen Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation .config.gz Description: application/gzip
renesas-drivers-2016-12-27-v4.10-rc1
I have pushed renesas-drivers-2016-12-27-v4.10-rc1 to https://git.kernel.org/cgit/linux/kernel/git/geert/renesas-drivers.git This tree is meant to ease development of platform support and drivers for Renesas ARM SoCs. It is created by merging (a) the for-next branches of various subsystem trees and (b) branches with driver code submitted or planned for submission to maintainers into the development branch of Simon Horman's renesas.git tree. As v4.9 has been released, we're back to normal mode. Today's version is based on renesas-devel-20161220-v4.9. Note that arm64/defconfig kernels have become too big to be bootable on Salvator-X with the v2120 firmware. Disable e.g. CONFIG_ARCH_SUNXI to reduce kernel size to make it fit again. Included branches with driver code: - clk-renesas-for-v4.10 - clk-renesas-for-v4.11 - sh-pfc-for-v4.11 - topic/r8a7791-pfc-adi - topic/r8a7796-dmac-dts-v2-rebased4~1 - topic/vin-gen2-dts-v1-rebased6 - git://linuxtv.org/pinchartl/media.git#vsp1/histogram - https://git.ragnatech.se/linux#for-renesas-drivers - topic/ipmmu-multi-arch-v6 - topic/r8a7795-ipmmu-v2-rebased4 - topic/r8a7796-ipmmu-v1-rebased4 - topic/r8a7795-ipmmu-integration-v2 - topic/vsp1-pa-improvements-v1-rebased1 - topic/vsp1-writeback-v2-rebased2 - topic/iommu-devel-du-rebased1 - topic/r8a7795-es2-v1-rebased6 - git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#renesas/thermal-on-4.10-next - git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git#vsp1/suspend-resume-race - topic/drm-r8a7796-next-v1-rebased1 - git://linuxtv.org/pinchartl/media.git#drm/du/lvds-panel - git://linuxtv.org/pinchartl/media.git#drm/du/lvds-encoder - git://linuxtv.org/pinchartl/media.git#drm/du/hdmi Included fixes: - arm64: don't pull uaccess.h into *.S - smp/hotplug: Undo tglxs brainfart Included subsystem trees: - git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next - git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next - git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next - git://git.infradead.org/users/dedekind/l2-mtd-2.6.git#master - git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master - git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next - git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next - git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git#master - git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next - git://people.freedesktop.org/~airlied/linux#drm-next - git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next - git://linuxtv.org/mchehab/media-next.git#master - git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next - git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next - git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next - git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next - git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#testing/next - git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine.git#next - git://git.infradead.org/users/vkoul/slave-dma.git#next - git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next - git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next - git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next - git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next - git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next - git://git.infradead.org/battery-2.6.git#master - git://www.linux-watchdog.org/linux-watchdog-next.git#master - git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next - git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git#for-next/core - git://anongit.freedesktop.org/drm-intel#topic/drm-misc - git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next - git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next - git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
Re: [PATCH v3 12/13] drm: rcar-du: Replace manual bridge implementation with DRM bridge
Hi Laurent, On Tue, Nov 29, 2016 at 10:04 AM, Laurent Pinchartwrote: > The rcar-du driver contains a manual implementation of HDMI and VGA > bridges. Use DRM bridges to replace it. > > Signed-off-by: Laurent Pinchart > --- > drivers/gpu/drm/rcar-du/Kconfig | 6 -- > drivers/gpu/drm/rcar-du/Makefile | 5 +- > drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 104 +-- > drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 2 - > drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 134 > -- > drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h | 35 > drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 82 -- > drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 23 - > 8 files changed, 60 insertions(+), 331 deletions(-) > delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c > delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h > delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c > delete mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h > > diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig > index 2bab449add76..06121eeba9e5 100644 > --- a/drivers/gpu/drm/rcar-du/Kconfig > +++ b/drivers/gpu/drm/rcar-du/Kconfig > @@ -11,12 +11,6 @@ config DRM_RCAR_DU > Choose this option if you have an R-Car chipset. > If M is selected the module will be called rcar-du-drm. > > -config DRM_RCAR_HDMI > - bool "R-Car DU HDMI Encoder Support" > - depends on DRM_RCAR_DU > - help > - Enable support for external HDMI encoders. > - Please note this symbol is selected in several defconfigs, so these should be updated with its replacement symbol. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
The failure summary report of GEN3 for linux stable v4.9
Hi all, My name is Hoan from Jinzai Solution. We have tested the linux stable v4.9 for Gen3 Salvator-X (H3) So we would like to report the summary of the failure. Best Regards, Jinso/Linux Team HOAN GEN3(H3)_The failure summary report for linux stable v4.9.xlsx Description: MS-Excel 2007 spreadsheet
Re: [GIT PULL FOR renesas-drivers] Fix suspend/resume and race on M2M pipelines
On Tue, Dec 27, 2016 at 12:18 PM, Geert Uytterhoevenwrote: > On Tue, Dec 13, 2016 at 7:38 PM, Kieran Bingham > wrote: >> From: Kieran Bingham >> >> The following changes since commit 69973b830859bc6529a7a0468ba0d80ee5117826: >> >> Linux 4.9 (2016-12-11 11:17:54 -0800) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git >> vsp1/suspend-resume-race >> >> for you to fetch changes up to a952e0103f86d818a444923adeef50fdcb3f70b9: >> >> media: Catch null pipes on pipeline stop (2016-12-13 16:25:13 +) >> >> >> Kieran Bingham (4): >> v4l: vsp1: Move vsp1_video_setup_pipeline() >> v4l: vsp1: Refactor video pipeline configuration >> v4l: vsp1: Use local display lists and remove global pipe->dl >> media: Catch null pipes on pipeline stop >> >> drivers/media/media-entity.c | 2 + >> drivers/media/platform/vsp1/vsp1_drm.c | 20 ++--- >> drivers/media/platform/vsp1/vsp1_drv.c | 4 + >> drivers/media/platform/vsp1/vsp1_pipe.c | 1 + >> drivers/media/platform/vsp1/vsp1_pipe.h | 4 +- >> drivers/media/platform/vsp1/vsp1_video.c | 127 >> +++ >> 6 files changed, 79 insertions(+), 79 deletions(-) > > This conflicts with your own commit f94c16126bec2da4 ("v4l: vsp1: > Remove redundant context variables"), > in topic/vsp1-pa-improvements-v1-rebased1. > > I fixed it up like this: > --- a/drivers/media/platform/vsp1/vsp1_video.c > +++ b/drivers/media/platform/vsp1/vsp1_video.c > @@@ -350,9 -355,47 +350,48 @@@ static void vsp1_video_frame_end(struc > pipe->buffers_ready |= 1 << video->pipe_index; > } > > + static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe, > +struct vsp1_dl_list *dl) > + list_for_each_entry(entity, >entities, list_pipe) { > - vsp1_entity_route_setup(entity, dl); > ++ vsp1_entity_route_setup(entity, pipe, pipe->dl); That should of course have been vsp1_entity_route_setup(entity, pipe, dl); Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [GIT PULL FOR renesas-drivers] Fix suspend/resume and race on M2M pipelines
Hi Kieran, On Tue, Dec 13, 2016 at 7:38 PM, Kieran Binghamwrote: > From: Kieran Bingham > > The following changes since commit 69973b830859bc6529a7a0468ba0d80ee5117826: > > Linux 4.9 (2016-12-11 11:17:54 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git > vsp1/suspend-resume-race > > for you to fetch changes up to a952e0103f86d818a444923adeef50fdcb3f70b9: > > media: Catch null pipes on pipeline stop (2016-12-13 16:25:13 +) > > > Kieran Bingham (4): > v4l: vsp1: Move vsp1_video_setup_pipeline() > v4l: vsp1: Refactor video pipeline configuration > v4l: vsp1: Use local display lists and remove global pipe->dl > media: Catch null pipes on pipeline stop > > drivers/media/media-entity.c | 2 + > drivers/media/platform/vsp1/vsp1_drm.c | 20 ++--- > drivers/media/platform/vsp1/vsp1_drv.c | 4 + > drivers/media/platform/vsp1/vsp1_pipe.c | 1 + > drivers/media/platform/vsp1/vsp1_pipe.h | 4 +- > drivers/media/platform/vsp1/vsp1_video.c | 127 > +++ > 6 files changed, 79 insertions(+), 79 deletions(-) This conflicts with your own commit f94c16126bec2da4 ("v4l: vsp1: Remove redundant context variables"), in topic/vsp1-pa-improvements-v1-rebased1. I fixed it up like this: diff --cc drivers/media/platform/vsp1/vsp1_drm.c index 9bb7c1a04157223c,bf735e85b59774c3..5227c3404ec0985c --- a/drivers/media/platform/vsp1/vsp1_drm.c +++ b/drivers/media/platform/vsp1/vsp1_drm.c @@@ -500,14 -491,14 +501,14 @@@ void vsp1_du_atomic_flush(struct devic } } - vsp1_entity_route_setup(entity, pipe, pipe->dl); - vsp1_entity_route_setup(entity, dl); ++ vsp1_entity_route_setup(entity, pipe, dl); if (entity->ops->configure) { - entity->ops->configure(entity, pipe, pipe->dl, + entity->ops->configure(entity, pipe, dl, VSP1_ENTITY_PARAMS_INIT); - entity->ops->configure(entity, pipe, pipe->dl, + entity->ops->configure(entity, pipe, dl, VSP1_ENTITY_PARAMS_RUNTIME); - entity->ops->configure(entity, pipe, pipe->dl, + entity->ops->configure(entity, pipe, dl, VSP1_ENTITY_PARAMS_PARTITION); } } diff --cc drivers/media/platform/vsp1/vsp1_pipe.h index 9e108ddcceb6f977,98980c85081fdc60..d2903c14a211419d --- a/drivers/media/platform/vsp1/vsp1_pipe.h +++ b/drivers/media/platform/vsp1/vsp1_pipe.h @@@ -113,11 -108,10 +115,9 @@@ struct vsp1_pipeline struct list_head entities; - struct vsp1_dl_list *dl; - - unsigned int div_size; unsigned int partitions; struct v4l2_rect partition; - unsigned int current_partition; + struct v4l2_rect part_table[VSP1_PIPE_MAX_PARTITIONS]; }; void vsp1_pipeline_reset(struct vsp1_pipeline *pipe); diff --cc drivers/media/platform/vsp1/vsp1_video.c index 9c798a72d47a618c,d0c84508d7f459ae..1df65edbebfa8d1b --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@@ -350,9 -355,47 +350,48 @@@ static void vsp1_video_frame_end(struc pipe->buffers_ready |= 1 << video->pipe_index; } + static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe, +struct vsp1_dl_list *dl) + { + struct vsp1_entity *entity; + + /* Determine this pipelines sizes for image partitioning support. */ + vsp1_video_pipeline_setup_partitions(pipe); + + if (pipe->uds) { + struct vsp1_uds *uds = to_uds(>uds->subdev); + + /* If a BRU is present in the pipeline before the UDS, the alpha +* component doesn't need to be scaled as the BRU output alpha +* value is fixed to 255. Otherwise we need to scale the alpha +* component only when available at the input RPF. +*/ + if (pipe->uds_input->type == VSP1_ENTITY_BRU) { + uds->scale_alpha = false; + } else { + struct vsp1_rwpf *rpf = + to_rwpf(>uds_input->subdev); + + uds->scale_alpha = rpf->fmtinfo->alpha; + } + } + + list_for_each_entry(entity, >entities, list_pipe) { - vsp1_entity_route_setup(entity, dl); ++ vsp1_entity_route_setup(entity, pipe, pipe->dl); + + if (entity->ops->configure) + entity->ops->configure(entity, pipe, dl, +