| Message ID | 10305550.upKOiT5SIy@wasted.cogentembedded.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Sergei, Thank you for the patch. On Saturday 20 Aug 2016 00:57:59 Sergei Shtylyov wrote: > Add support for the R8A7792 VSP1V cores which are different from the other > gen2 VSP1 cores... > > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> > > --- > This patch is against the 'media_tree.git' repo's 'master' branch. The vsp1/next branch of my media.git tree contains a few patches that conflict with this patch. I've resolved the conflicts manually and pushed the result to git://linuxtv.org/pinchartl/media.git vsp1/next Could you please check the conflict resolution ? Could you please also give me the full 32-bit IP version number for the VSP1V- D and VSP1V-S on R8A7792 ? > drivers/media/platform/vsp1/vsp1_drv.c | 20 ++++++++++++++++++++ > drivers/media/platform/vsp1/vsp1_regs.h | 2 ++ > 2 files changed, 22 insertions(+) > > Index: media_tree/drivers/media/platform/vsp1/vsp1_drv.c > =================================================================== > --- media_tree.orig/drivers/media/platform/vsp1/vsp1_drv.c > +++ media_tree/drivers/media/platform/vsp1/vsp1_drv.c > @@ -596,6 +596,26 @@ static const struct vsp1_device_info vsp > .num_bru_inputs = 4, > .uapi = true, > }, { > + .version = VI6_IP_VERSION_MODEL_VSPS_V2H, > + .gen = 2, > + .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT | > + VSP1_HAS_SRU | VSP1_HAS_WPF_VFLIP, > + .rpf_count = 4, > + .uds_count = 1, > + .wpf_count = 4, > + .num_bru_inputs = 4, > + .uapi = true, > + }, { > + .version = VI6_IP_VERSION_MODEL_VSPD_V2H, > + .gen = 2, > + .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT | > + VSP1_HAS_LIF, > + .rpf_count = 4, > + .uds_count = 1, > + .wpf_count = 1, > + .num_bru_inputs = 4, > + .uapi = true, > + }, { > .version = VI6_IP_VERSION_MODEL_VSPI_GEN3, > .gen = 3, > .features = VSP1_HAS_CLU | VSP1_HAS_LUT | VSP1_HAS_SRU > Index: media_tree/drivers/media/platform/vsp1/vsp1_regs.h > =================================================================== > --- media_tree.orig/drivers/media/platform/vsp1/vsp1_regs.h > +++ media_tree/drivers/media/platform/vsp1/vsp1_regs.h > @@ -660,6 +660,8 @@ > #define VI6_IP_VERSION_MODEL_VSPR_H2 (0x0a << 8) > #define VI6_IP_VERSION_MODEL_VSPD_GEN2 (0x0b << 8) > #define VI6_IP_VERSION_MODEL_VSPS_M2 (0x0c << 8) > +#define VI6_IP_VERSION_MODEL_VSPS_V2H (0x12 << 8) > +#define VI6_IP_VERSION_MODEL_VSPD_V2H (0x13 << 8) > #define VI6_IP_VERSION_MODEL_VSPI_GEN3 (0x14 << 8) > #define VI6_IP_VERSION_MODEL_VSPBD_GEN3 (0x15 << 8) > #define VI6_IP_VERSION_MODEL_VSPBC_GEN3 (0x16 << 8)
Hello. On 09/02/2016 01:47 AM, Laurent Pinchart wrote: >> Add support for the R8A7792 VSP1V cores which are different from the other >> gen2 VSP1 cores... >> >> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> >> >> --- >> This patch is against the 'media_tree.git' repo's 'master' branch. > > The vsp1/next branch of my media.git tree contains a few patches that conflict > with this patch. I've resolved the conflicts manually and pushed the result to > > git://linuxtv.org/pinchartl/media.git vsp1/next > > Could you please check the conflict resolution ? It seems alright. But I hate, hate, hate the forced branch updates! One wrong move and you're trapped with the changes you don't know how to resolve anyway... :-( > Could you please also give me the full 32-bit IP version number for the VSP1V- > D and VSP1V-S on R8A7792 ? As I told you on IRC: [ 2.563823] vsp1 fe928000.vsp1: IP version 0x01011201 [ 2.574416] vsp1 fe930000.vsp1: IP version 0x01011301 [ 2.583543] vsp1 fe938000.vsp1: IP version 0x01011301 MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: media_tree/drivers/media/platform/vsp1/vsp1_drv.c =================================================================== --- media_tree.orig/drivers/media/platform/vsp1/vsp1_drv.c +++ media_tree/drivers/media/platform/vsp1/vsp1_drv.c @@ -596,6 +596,26 @@ static const struct vsp1_device_info vsp .num_bru_inputs = 4, .uapi = true, }, { + .version = VI6_IP_VERSION_MODEL_VSPS_V2H, + .gen = 2, + .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT | + VSP1_HAS_SRU | VSP1_HAS_WPF_VFLIP, + .rpf_count = 4, + .uds_count = 1, + .wpf_count = 4, + .num_bru_inputs = 4, + .uapi = true, + }, { + .version = VI6_IP_VERSION_MODEL_VSPD_V2H, + .gen = 2, + .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT | + VSP1_HAS_LIF, + .rpf_count = 4, + .uds_count = 1, + .wpf_count = 1, + .num_bru_inputs = 4, + .uapi = true, + }, { .version = VI6_IP_VERSION_MODEL_VSPI_GEN3, .gen = 3, .features = VSP1_HAS_CLU | VSP1_HAS_LUT | VSP1_HAS_SRU Index: media_tree/drivers/media/platform/vsp1/vsp1_regs.h =================================================================== --- media_tree.orig/drivers/media/platform/vsp1/vsp1_regs.h +++ media_tree/drivers/media/platform/vsp1/vsp1_regs.h @@ -660,6 +660,8 @@ #define VI6_IP_VERSION_MODEL_VSPR_H2 (0x0a << 8) #define VI6_IP_VERSION_MODEL_VSPD_GEN2 (0x0b << 8) #define VI6_IP_VERSION_MODEL_VSPS_M2 (0x0c << 8) +#define VI6_IP_VERSION_MODEL_VSPS_V2H (0x12 << 8) +#define VI6_IP_VERSION_MODEL_VSPD_V2H (0x13 << 8) #define VI6_IP_VERSION_MODEL_VSPI_GEN3 (0x14 << 8) #define VI6_IP_VERSION_MODEL_VSPBD_GEN3 (0x15 << 8) #define VI6_IP_VERSION_MODEL_VSPBC_GEN3 (0x16 << 8)
Add support for the R8A7792 VSP1V cores which are different from the other gen2 VSP1 cores... Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- This patch is against the 'media_tree.git' repo's 'master' branch. drivers/media/platform/vsp1/vsp1_drv.c | 20 ++++++++++++++++++++ drivers/media/platform/vsp1/vsp1_regs.h | 2 ++ 2 files changed, 22 insertions(+) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html