Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hi Geert, On Wednesday 16 December 2015 09:39:29 Geert Uytterhoeven wrote: > On Sat, Dec 5, 2015 at 11:54 PM, Laurent Pinchart wrote: > > On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: > >> As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 > >> is getting old, and has lots of conflicts with recent -next, do you plan > >> to publish this in a branch, and a separate branch for integration, to > >> ease integration in renesas-drivers? > >> > >> Alternatively, I can just import the series you posted, but having the > >> broken-out integration part would be nice. > > > > The issue I'm facing is that there's more than just two series. Beside the > > base VSP patches from this series, I have a series of DRM patches that > > depend on this one, a series of V4L2 core patches, another series of VSP > > patches that I still need to finish and a bunch of integration patches. > > As some of these have dependencies on H3 CCF support that hasn't landed > > in Simon's tree yet, I have merged your topic/cpg-mssr-v6 and > > topic/r8a7795-drivers-sh-v1 branches into my tree for development. > > > > I could keep all series in separate branches and merge the two topic > > branches last, but that's not very handy during development when I have > > to continuously rebase my patches. Is there a way I could handle this > > that would make your life easier while not making mine more difficult ? > > I feel your pain... > > For development, committing to a single branch and rebasing interactively is > also my workflow. But after a few 100 commits, rebasing takes a long time. > And you can't publish that tree. > > I started moving "finished" stuff to separate topic branches (this is the > stuff published/imported into renesas-drivers topic branches, or kept in > private branches for the parts I don't want to publish it yet), and merging > them early on. The issue here is that there is only a single batch of patches I consider as finished, and those are already present in a branch based directly on top of linuxtv/master that I then merge into my working branches. On a side note I've now sent a pull request for that. The rest is not considered finished yet, I've modified the oldest branches no later than today. The code is stabilizing though, and I expect to send a pull request for a first batch of DU patches after the v4.5 merge window closes. > Actual development is still done on top with frequent rebasing. > > The problem starts when updating that. Instead of a simple rebase -i, it now > involves: > - Duplicating the old topic branch, version number increased, > - Interactively rebasing the new topic branch, including/squashing commits > from recent development, > - Merging in the new topic branch "early on", and rebasing all other > private development on top of that. > For "big" changes that's OK. For adding a bunch of Acked-by's it's a lot of > work. > > > In the meantime I've pushed vsp1-kms-20151206 to > > git://linuxtv.org/pinchartl/media.git. > > Hadn't thanked you yet for that: Thanks! You're welcome, and there's now vsp1-kms-20151216 :-) -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hi Laurent,
On Sat, Dec 5, 2015 at 11:54 PM, Laurent Pinchart
wrote:
> On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote:
>> As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is
>> getting old, and has lots of conflicts with recent -next, do you plan to
>> publish this in a branch, and a separate branch for integration, to ease
>> integration in renesas-drivers?
>>
>> Alternatively, I can just import the series you posted, but having the
>> broken-out integration part would be nice.
>
> The issue I'm facing is that there's more than just two series. Beside the
> base VSP patches from this series, I have a series of DRM patches that depend
> on this one, a series of V4L2 core patches, another series of VSP patches that
> I still need to finish and a bunch of integration patches. As some of these
> have dependencies on H3 CCF support that hasn't landed in Simon's tree yet, I
> have merged your topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches
> into my tree for development.
>
> I could keep all series in separate branches and merge the two topic branches
> last, but that's not very handy during development when I have to continuously
> rebase my patches. Is there a way I could handle this that would make your
> life easier while not making mine more difficult ?
I feel your pain...
For development, committing to a single branch and rebasing interactively is
also my workflow. But after a few 100 commits, rebasing takes a long time.
And you can't publish that tree.
I started moving "finished" stuff to separate topic branches (this is the
stuff published/imported into renesas-drivers topic branches, or kept in
private branches for the parts I don't want to publish it yet), and merging
them early on.
Actual development is still done on top with frequent rebasing.
The problem starts when updating that. Instead of a simple rebase -i, it now
involves:
- Duplicating the old topic branch, version number increased,
- Interactively rebasing the new topic branch, including/squashing commits
from recent development,
- Merging in the new topic branch "early on", and rebasing all other private
development on top of that.
For "big" changes that's OK. For adding a bunch of Acked-by's it's a lot of
work.
> In the meantime I've pushed vsp1-kms-20151206 to
> git://linuxtv.org/pinchartl/media.git.
Hadn't thanked you yet for that: Thanks!
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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
On 12/14/2015 1:53 AM, Laurent Pinchart wrote: Hello Khiem, On Friday 11 December 2015 15:43:27 Khiem Nguyen wrote: On 12/6/2015 5:54 AM, Laurent Pinchart wrote: On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: On Sat, Dec 5, 2015 at 3:12 AM, Laurent Pinchart wrote: This patch set adds support for the Renesas R-Car Gen3 SoC family to the VSP1 driver. The large number of patches is caused by a change in the display controller architecture that makes usage of the VSP mandatory as the display controller has lost the ability to read data from memory. Patch 01/32 to 27/32 prepare for the implementation of an API exported to the DRM driver in patch 28/32. Patches 31/32 enables support for the R-Car Gen3 family, and patch 32/32 finally enhances perfomances by implementing support for display lists. The major change compared to v1 is the usage of the IP version register instead of DT properties to configure device parameters such as the number of BRU inputs or the availability of the BRU. Thanks for your series! As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is getting old, and has lots of conflicts with recent -next, do you plan to publish this in a branch, and a separate branch for integration, to ease integration in renesas-drivers? Alternatively, I can just import the series you posted, but having the broken-out integration part would be nice. The issue I'm facing is that there's more than just two series. Beside the base VSP patches from this series, I have a series of DRM patches that depend on this one, a series of V4L2 core patches, another series of VSP patches that I still need to finish and a bunch of integration patches. As some of these have dependencies on H3 CCF support that hasn't landed in Simon's tree yet, I have merged your topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches into my tree for development. I could keep all series in separate branches and merge the two topic branches last, but that's not very handy during development when I have to continuously rebase my patches. Is there a way I could handle this that would make your life easier while not making mine more difficult ? In the meantime I've pushed vsp1-kms-20151206 to git://linuxtv.org/pinchartl/media.git. I failed to confirm DU (VGA port) with above branch. To make DU (VGA port) work, it seems I need to merge more branches like topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches from renesas-drivers repo, is it correct ? The git://linuxtv.org/pinchartl/media.git vsp1-kms-20151206 branch already contains topic/r8a7795-drivers-sh-v1 and topic/cpg-mssr-v6. What is the failure you're seeing ? Honestly, I tried some configurations but there's no output to VGA port (the display is blank). 1. The default 'defconfig' of this tag. 2. Enable DRM, CMA, RCAR_DU 3. Enable DRM, CMA, RCAR_DU, VSP1 -> I got kernel build error in file drivers/media/platform/vsp1/vsp1_pipe.c I also tried another tag vsp1-kms-request-20151206 which have more patches on top of vsp1-kms-20151206. After enabling all DRM, CMA, RCAR_DU, VSP1, kernel build is OK. Got a 'green color' display and no kernel log output. With the same u-boot and IPL, it's able to see display output normally if using Gen3 BSP version. Therefore, I guess it's no impact to DU operation. Please let me know your procedure to test DU operation with your tag. -- Best regards, KHIEM Nguyen -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hello Khiem, On Friday 11 December 2015 15:43:27 Khiem Nguyen wrote: > On 12/6/2015 5:54 AM, Laurent Pinchart wrote: > > On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: > >> On Sat, Dec 5, 2015 at 3:12 AM, Laurent Pinchart wrote: > >>> This patch set adds support for the Renesas R-Car Gen3 SoC family to the > >>> VSP1 driver. The large number of patches is caused by a change in the > >>> display controller architecture that makes usage of the VSP mandatory as > >>> the display controller has lost the ability to read data from memory. > >>> > >>> Patch 01/32 to 27/32 prepare for the implementation of an API exported > >>> to the DRM driver in patch 28/32. Patches 31/32 enables support for the > >>> R-Car Gen3 family, and patch 32/32 finally enhances perfomances by > >>> implementing support for display lists. > >>> > >>> The major change compared to v1 is the usage of the IP version register > >>> instead of DT properties to configure device parameters such as the > >>> number of BRU inputs or the availability of the BRU. > >> > >> Thanks for your series! > >> > >> As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 > >> is getting old, and has lots of conflicts with recent -next, do you plan > >> to publish this in a branch, and a separate branch for integration, to > >> ease integration in renesas-drivers? > >> > >> Alternatively, I can just import the series you posted, but having the > >> broken-out integration part would be nice. > > > > The issue I'm facing is that there's more than just two series. Beside the > > base VSP patches from this series, I have a series of DRM patches that > > depend on this one, a series of V4L2 core patches, another series of VSP > > patches that I still need to finish and a bunch of integration patches. > > As some of these have dependencies on H3 CCF support that hasn't landed > > in Simon's tree yet, I have merged your topic/cpg-mssr-v6 and > > topic/r8a7795-drivers-sh-v1 branches into my tree for development. > > > > I could keep all series in separate branches and merge the two topic > > branches last, but that's not very handy during development when I have > > to continuously rebase my patches. Is there a way I could handle this > > that would make your life easier while not making mine more difficult ? > > > > In the meantime I've pushed vsp1-kms-20151206 to > > git://linuxtv.org/pinchartl/media.git. > > I failed to confirm DU (VGA port) with above branch. > > To make DU (VGA port) work, > it seems I need to merge more branches like topic/cpg-mssr-v6 > and topic/r8a7795-drivers-sh-v1 branches from renesas-drivers repo, is > it correct ? The git://linuxtv.org/pinchartl/media.git vsp1-kms-20151206 branch already contains topic/r8a7795-drivers-sh-v1 and topic/cpg-mssr-v6. What is the failure you're seeing ? -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hi Laurent, On 12/6/2015 5:54 AM, Laurent Pinchart wrote: Hi Geert, On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: On Sat, Dec 5, 2015 at 3:12 AM, Laurent Pinchart wrote: This patch set adds support for the Renesas R-Car Gen3 SoC family to the VSP1 driver. The large number of patches is caused by a change in the display controller architecture that makes usage of the VSP mandatory as the display controller has lost the ability to read data from memory. Patch 01/32 to 27/32 prepare for the implementation of an API exported to the DRM driver in patch 28/32. Patches 31/32 enables support for the R-Car Gen3 family, and patch 32/32 finally enhances perfomances by implementing support for display lists. The major change compared to v1 is the usage of the IP version register instead of DT properties to configure device parameters such as the number of BRU inputs or the availability of the BRU. Thanks for your series! As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is getting old, and has lots of conflicts with recent -next, do you plan to publish this in a branch, and a separate branch for integration, to ease integration in renesas-drivers? Alternatively, I can just import the series you posted, but having the broken-out integration part would be nice. The issue I'm facing is that there's more than just two series. Beside the base VSP patches from this series, I have a series of DRM patches that depend on this one, a series of V4L2 core patches, another series of VSP patches that I still need to finish and a bunch of integration patches. As some of these have dependencies on H3 CCF support that hasn't landed in Simon's tree yet, I have merged your topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches into my tree for development. I could keep all series in separate branches and merge the two topic branches last, but that's not very handy during development when I have to continuously rebase my patches. Is there a way I could handle this that would make your life easier while not making mine more difficult ? In the meantime I've pushed vsp1-kms-20151206 to git://linuxtv.org/pinchartl/media.git. I failed to confirm DU (VGA port) with above branch. To make DU (VGA port) work, it seems I need to merge more branches like topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches from renesas-drivers repo, is it correct ? Thanks. -- Best regards, KHIEM Nguyen -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hi Geert, On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: > On Sat, Dec 5, 2015 at 3:12 AM, Laurent Pinchart wrote: > > This patch set adds support for the Renesas R-Car Gen3 SoC family to the > > VSP1 driver. The large number of patches is caused by a change in the > > display controller architecture that makes usage of the VSP mandatory as > > the display controller has lost the ability to read data from memory. > > > > Patch 01/32 to 27/32 prepare for the implementation of an API exported to > > the DRM driver in patch 28/32. Patches 31/32 enables support for the > > R-Car Gen3 family, and patch 32/32 finally enhances perfomances by > > implementing support for display lists. > > > > The major change compared to v1 is the usage of the IP version register > > instead of DT properties to configure device parameters such as the number > > of BRU inputs or the availability of the BRU. > > Thanks for your series! > > As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is > getting old, and has lots of conflicts with recent -next, do you plan to > publish this in a branch, and a separate branch for integration, to ease > integration in renesas-drivers? > > Alternatively, I can just import the series you posted, but having the > broken-out integration part would be nice. The issue I'm facing is that there's more than just two series. Beside the base VSP patches from this series, I have a series of DRM patches that depend on this one, a series of V4L2 core patches, another series of VSP patches that I still need to finish and a bunch of integration patches. As some of these have dependencies on H3 CCF support that hasn't landed in Simon's tree yet, I have merged your topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches into my tree for development. I could keep all series in separate branches and merge the two topic branches last, but that's not very handy during development when I have to continuously rebase my patches. Is there a way I could handle this that would make your life easier while not making mine more difficult ? In the meantime I've pushed vsp1-kms-20151206 to git://linuxtv.org/pinchartl/media.git. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hi Laurent,
On Sat, Dec 5, 2015 at 3:12 AM, Laurent Pinchart
wrote:
> This patch set adds support for the Renesas R-Car Gen3 SoC family to the VSP1
> driver. The large number of patches is caused by a change in the display
> controller architecture that makes usage of the VSP mandatory as the display
> controller has lost the ability to read data from memory.
>
> Patch 01/32 to 27/32 prepare for the implementation of an API exported to the
> DRM driver in patch 28/32. Patches 31/32 enables support for the R-Car Gen3
> family, and patch 32/32 finally enhances perfomances by implementing support
> for display lists.
>
> The major change compared to v1 is the usage of the IP version register
> instead of DT properties to configure device parameters such as the number of
> BRU inputs or the availability of the BRU.
Thanks for your series!
As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is
getting old, and has lots of conflicts with recent -next, do you plan to publish
this in a branch, and a separate branch for integration, to ease integration
in renesas-drivers?
Alternatively, I can just import the series you posted, but having the
broken-out integration part would be nice.
Thanks again!
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
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 00/32] VSP: Add R-Car Gen3 support
Hello, This patch set adds support for the Renesas R-Car Gen3 SoC family to the VSP1 driver. The large number of patches is caused by a change in the display controller architecture that makes usage of the VSP mandatory as the display controller has lost the ability to read data from memory. Patch 01/32 to 27/32 prepare for the implementation of an API exported to the DRM driver in patch 28/32. Patches 31/32 enables support for the R-Car Gen3 family, and patch 32/32 finally enhances perfomances by implementing support for display lists. The major change compared to v1 is the usage of the IP version register instead of DT properties to configure device parameters such as the number of BRU inputs or the availability of the BRU. Laurent Pinchart (31): v4l: vsp1: Change the type of the rwpf field in struct vsp1_video v4l: vsp1: Store the memory format in struct vsp1_rwpf v4l: vsp1: Move video operations to vsp1_rwpf v4l: vsp1: Rename vsp1_video_buffer to vsp1_vb2_buffer v4l: vsp1: Move video device out of struct vsp1_rwpf v4l: vsp1: Make rwpf operations independent of video device v4l: vsp1: Support VSP1 instances without any UDS v4l: vsp1: Move vsp1_video pointer from vsp1_entity to vsp1_rwpf v4l: vsp1: Remove struct vsp1_pipeline num_video field v4l: vsp1: Decouple pipeline end of frame processing from vsp1_video v4l: vsp1: Split pipeline management code from vsp1_video.c v4l: vsp1: Rename video pipeline functions to use vsp1_video prefix v4l: vsp1: Extract pipeline initialization code into a function v4l: vsp1: Reuse local variable instead of recomputing it v4l: vsp1: Extract link creation to separate function v4l: vsp1: Document the vsp1_pipeline structure v4l: vsp1: Fix typo in VI6_DISP_IRQ_STA_DST register name v4l: vsp1: Set the SRU CTRL0 register when starting the stream v4l: vsp1: Remove unused module read functions v4l: vsp1: Move entity route setup function to vsp1_entity.c v4l: vsp1: Make number of BRU inputs configurable v4l: vsp1: Make the BRU optional v4l: vsp1: Move format info to vsp1_pipe.c v4l: vsp1: Make the userspace API optional v4l: vsp1: Make pipeline inputs array index by RPF index v4l: vsp1: Set the alpha value manually in RPF and WPF s_stream handlers v4l: vsp1: Don't validate links when the userspace API is disabled v4l: vsp1: Add VSP+DU support v4l: vsp1: Disconnect unused RPFs from the DRM pipeline v4l: vsp1: Implement atomic update for the DRM driver v4l: vsp1: Add support for the R-Car Gen3 VSP2 Takashi Saito (1): v4l: vsp1: Add display list support .../devicetree/bindings/media/renesas,vsp1.txt | 21 +- drivers/media/platform/vsp1/Makefile | 3 +- drivers/media/platform/vsp1/vsp1.h | 24 + drivers/media/platform/vsp1/vsp1_bru.c | 33 +- drivers/media/platform/vsp1/vsp1_bru.h | 3 +- drivers/media/platform/vsp1/vsp1_dl.c | 304 +++ drivers/media/platform/vsp1/vsp1_dl.h | 42 ++ drivers/media/platform/vsp1/vsp1_drm.c | 595 + drivers/media/platform/vsp1/vsp1_drm.h | 38 ++ drivers/media/platform/vsp1/vsp1_drv.c | 254 +++-- drivers/media/platform/vsp1/vsp1_entity.c | 31 +- drivers/media/platform/vsp1/vsp1_entity.h | 14 +- drivers/media/platform/vsp1/vsp1_hsit.c| 2 +- drivers/media/platform/vsp1/vsp1_lif.c | 11 +- drivers/media/platform/vsp1/vsp1_lut.c | 7 +- drivers/media/platform/vsp1/vsp1_pipe.c| 405 ++ drivers/media/platform/vsp1/vsp1_pipe.h| 134 + drivers/media/platform/vsp1/vsp1_regs.h| 32 +- drivers/media/platform/vsp1/vsp1_rpf.c | 77 ++- drivers/media/platform/vsp1/vsp1_rwpf.h| 24 +- drivers/media/platform/vsp1/vsp1_sru.c | 9 +- drivers/media/platform/vsp1/vsp1_uds.c | 8 +- drivers/media/platform/vsp1/vsp1_video.c | 516 -- drivers/media/platform/vsp1/vsp1_video.h | 111 +--- drivers/media/platform/vsp1/vsp1_wpf.c | 88 ++- include/media/vsp1.h | 33 ++ 26 files changed, 2069 insertions(+), 750 deletions(-) create mode 100644 drivers/media/platform/vsp1/vsp1_dl.c create mode 100644 drivers/media/platform/vsp1/vsp1_dl.h create mode 100644 drivers/media/platform/vsp1/vsp1_drm.c create mode 100644 drivers/media/platform/vsp1/vsp1_drm.h create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.c create mode 100644 drivers/media/platform/vsp1/vsp1_pipe.h create mode 100644 include/media/vsp1.h -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
