Skip to content

Commit

Permalink
media: v4l: vsp1: Add support for the DISCOM entity
Browse files Browse the repository at this point in the history
The DISCOM calculates a CRC on a configurable window of the frame. It
interfaces to the VSP through the UIF glue, hence the name used in the
code.

The module supports configuration of the CRC window through the crop
rectangle on the sink pad of the corresponding entity. However, unlike
the traditional V4L2 subdevice model, the crop rectangle does not
influence the format on the source pad.

Modeling the DISCOM as a sink-only entity would allow adhering to the
V4L2 subdevice model at the expense of more complex code in the driver,
as at the hardware level the UIF is handled as a sink+source entity. As
the DISCOM is only present in R-Car Gen3 VSP-D and VSP-DL instances it
is not exposed to userspace through V4L2 but controlled through the DU
driver. We can thus change this model later if needed without fear of
affecting userspace.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed May 17, 2018
1 parent 6e274b4 commit 33025a5
Show file tree
Hide file tree
Showing 8 changed files with 376 additions and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/media/platform/vsp1/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ vsp1-y += vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
vsp1-y += vsp1_clu.o vsp1_hsit.o vsp1_lut.o
vsp1-y += vsp1_brx.o vsp1_sru.o vsp1_uds.o
vsp1-y += vsp1_hgo.o vsp1_hgt.o vsp1_histo.o
vsp1-y += vsp1_lif.o
vsp1-y += vsp1_lif.o vsp1_uif.o

obj-$(CONFIG_VIDEO_RENESAS_VSP1) += vsp1.o
4 changes: 4 additions & 0 deletions drivers/media/platform/vsp1/vsp1.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ struct vsp1_lut;
struct vsp1_rwpf;
struct vsp1_sru;
struct vsp1_uds;
struct vsp1_uif;

#define VSP1_MAX_LIF 2
#define VSP1_MAX_RPF 5
#define VSP1_MAX_UDS 3
#define VSP1_MAX_UIF 2
#define VSP1_MAX_WPF 4

#define VSP1_HAS_LUT (1 << 1)
Expand All @@ -60,6 +62,7 @@ struct vsp1_device_info {
unsigned int lif_count;
unsigned int rpf_count;
unsigned int uds_count;
unsigned int uif_count;
unsigned int wpf_count;
unsigned int num_bru_inputs;
bool uapi;
Expand All @@ -86,6 +89,7 @@ struct vsp1_device {
struct vsp1_rwpf *rpf[VSP1_MAX_RPF];
struct vsp1_sru *sru;
struct vsp1_uds *uds[VSP1_MAX_UDS];
struct vsp1_uif *uif[VSP1_MAX_UIF];
struct vsp1_rwpf *wpf[VSP1_MAX_WPF];

struct list_head entities;
Expand Down
20 changes: 20 additions & 0 deletions drivers/media/platform/vsp1/vsp1_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include "vsp1_rwpf.h"
#include "vsp1_sru.h"
#include "vsp1_uds.h"
#include "vsp1_uif.h"
#include "vsp1_video.h"

/* -----------------------------------------------------------------------------
Expand Down Expand Up @@ -409,6 +410,19 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
list_add_tail(&uds->entity.list_dev, &vsp1->entities);
}

for (i = 0; i < vsp1->info->uif_count; ++i) {
struct vsp1_uif *uif;

uif = vsp1_uif_create(vsp1, i);
if (IS_ERR(uif)) {
ret = PTR_ERR(uif);
goto done;
}

vsp1->uif[i] = uif;
list_add_tail(&uif->entity.list_dev, &vsp1->entities);
}

for (i = 0; i < vsp1->info->wpf_count; ++i) {
struct vsp1_rwpf *wpf;

Expand Down Expand Up @@ -513,6 +527,9 @@ static int vsp1_device_init(struct vsp1_device *vsp1)
for (i = 0; i < vsp1->info->uds_count; ++i)
vsp1_write(vsp1, VI6_DPR_UDS_ROUTE(i), VI6_DPR_NODE_UNUSED);

for (i = 0; i < vsp1->info->uif_count; ++i)
vsp1_write(vsp1, VI6_DPR_UIF_ROUTE(i), VI6_DPR_NODE_UNUSED);

vsp1_write(vsp1, VI6_DPR_SRU_ROUTE, VI6_DPR_NODE_UNUSED);
vsp1_write(vsp1, VI6_DPR_LUT_ROUTE, VI6_DPR_NODE_UNUSED);
vsp1_write(vsp1, VI6_DPR_CLU_ROUTE, VI6_DPR_NODE_UNUSED);
Expand Down Expand Up @@ -740,6 +757,7 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
.features = VSP1_HAS_BRU | VSP1_HAS_WPF_VFLIP,
.lif_count = 1,
.rpf_count = 5,
.uif_count = 1,
.wpf_count = 2,
.num_bru_inputs = 5,
}, {
Expand All @@ -749,6 +767,7 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
.features = VSP1_HAS_BRS | VSP1_HAS_BRU,
.lif_count = 1,
.rpf_count = 5,
.uif_count = 1,
.wpf_count = 1,
.num_bru_inputs = 5,
}, {
Expand All @@ -758,6 +777,7 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
.features = VSP1_HAS_BRS | VSP1_HAS_BRU,
.lif_count = 2,
.rpf_count = 5,
.uif_count = 2,
.wpf_count = 2,
.num_bru_inputs = 5,
},
Expand Down
6 changes: 6 additions & 0 deletions drivers/media/platform/vsp1/vsp1_entity.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,6 +539,10 @@ struct media_pad *vsp1_entity_remote_pad(struct media_pad *pad)
{ VSP1_ENTITY_UDS, idx, VI6_DPR_UDS_ROUTE(idx), \
{ VI6_DPR_NODE_UDS(idx) }, VI6_DPR_NODE_UDS(idx) }

#define VSP1_ENTITY_ROUTE_UIF(idx) \
{ VSP1_ENTITY_UIF, idx, VI6_DPR_UIF_ROUTE(idx), \
{ VI6_DPR_NODE_UIF(idx) }, VI6_DPR_NODE_UIF(idx) }

#define VSP1_ENTITY_ROUTE_WPF(idx) \
{ VSP1_ENTITY_WPF, idx, 0, \
{ VI6_DPR_NODE_WPF(idx) }, VI6_DPR_NODE_WPF(idx) }
Expand Down Expand Up @@ -567,6 +571,8 @@ static const struct vsp1_route vsp1_routes[] = {
VSP1_ENTITY_ROUTE_UDS(0),
VSP1_ENTITY_ROUTE_UDS(1),
VSP1_ENTITY_ROUTE_UDS(2),
VSP1_ENTITY_ROUTE_UIF(0), /* Named UIF4 in the documentation */
VSP1_ENTITY_ROUTE_UIF(1), /* Named UIF5 in the documentation */
VSP1_ENTITY_ROUTE_WPF(0),
VSP1_ENTITY_ROUTE_WPF(1),
VSP1_ENTITY_ROUTE_WPF(2),
Expand Down
1 change: 1 addition & 0 deletions drivers/media/platform/vsp1/vsp1_entity.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ enum vsp1_entity_type {
VSP1_ENTITY_RPF,
VSP1_ENTITY_SRU,
VSP1_ENTITY_UDS,
VSP1_ENTITY_UIF,
VSP1_ENTITY_WPF,
};

Expand Down
41 changes: 41 additions & 0 deletions drivers/media/platform/vsp1/vsp1_regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,44 @@
#define VI6_WPF_WRBCK_CTRL 0x1034
#define VI6_WPF_WRBCK_CTRL_WBMD (1 << 0)

/* -----------------------------------------------------------------------------
* UIF Control Registers
*/

#define VI6_UIF_OFFSET 0x100

#define VI6_UIF_DISCOM_DOCMCR 0x1c00
#define VI6_UIF_DISCOM_DOCMCR_CMPRU (1 << 16)
#define VI6_UIF_DISCOM_DOCMCR_CMPR (1 << 0)

#define VI6_UIF_DISCOM_DOCMSTR 0x1c04
#define VI6_UIF_DISCOM_DOCMSTR_CMPPRE (1 << 1)
#define VI6_UIF_DISCOM_DOCMSTR_CMPST (1 << 0)

#define VI6_UIF_DISCOM_DOCMCLSTR 0x1c08
#define VI6_UIF_DISCOM_DOCMCLSTR_CMPCLPRE (1 << 1)
#define VI6_UIF_DISCOM_DOCMCLSTR_CMPCLST (1 << 0)

#define VI6_UIF_DISCOM_DOCMIENR 0x1c0c
#define VI6_UIF_DISCOM_DOCMIENR_CMPPREIEN (1 << 1)
#define VI6_UIF_DISCOM_DOCMIENR_CMPIEN (1 << 0)

#define VI6_UIF_DISCOM_DOCMMDR 0x1c10
#define VI6_UIF_DISCOM_DOCMMDR_INTHRH(n) ((n) << 16)

#define VI6_UIF_DISCOM_DOCMPMR 0x1c14
#define VI6_UIF_DISCOM_DOCMPMR_CMPDFF(n) ((n) << 17)
#define VI6_UIF_DISCOM_DOCMPMR_CMPDFA(n) ((n) << 8)
#define VI6_UIF_DISCOM_DOCMPMR_CMPDAUF (1 << 7)
#define VI6_UIF_DISCOM_DOCMPMR_SEL(n) ((n) << 0)

#define VI6_UIF_DISCOM_DOCMECRCR 0x1c18
#define VI6_UIF_DISCOM_DOCMCCRCR 0x1c1c
#define VI6_UIF_DISCOM_DOCMSPXR 0x1c20
#define VI6_UIF_DISCOM_DOCMSPYR 0x1c24
#define VI6_UIF_DISCOM_DOCMSZXR 0x1c28
#define VI6_UIF_DISCOM_DOCMSZYR 0x1c2c

/* -----------------------------------------------------------------------------
* DPR Control Registers
*/
Expand Down Expand Up @@ -339,7 +377,10 @@
#define VI6_DPR_SMPPT_PT_MASK (0x3f << 0)
#define VI6_DPR_SMPPT_PT_SHIFT 0

#define VI6_DPR_UIF_ROUTE(n) (0x2074 + (n) * 4)

#define VI6_DPR_NODE_RPF(n) (n)
#define VI6_DPR_NODE_UIF(n) (12 + (n))
#define VI6_DPR_NODE_SRU 16
#define VI6_DPR_NODE_UDS(n) (17 + (n))
#define VI6_DPR_NODE_LUT 22
Expand Down
Loading

0 comments on commit 33025a5

Please sign in to comment.