Skip to content

Commit

Permalink
media: rcar-vin: add function to manipulate Gen3 chsel value
Browse files Browse the repository at this point in the history
On Gen3 the CSI-2 routing is controlled by the VnCSI_IFMD register. One
feature of this register is that it's only present in the VIN0 and VIN4
instances. The register in VIN0 controls the routing for VIN0-3 and the
register in VIN4 controls routing for VIN4-7.

To be able to control routing from a media device this function is need
to control runtime PM for the subgroup master (VIN0 and VIN4). The
subgroup master must be switched on before the register is manipulated,
once the operation is complete it's safe to switch the master off and
the new routing will still be in effect.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Niklas Söderlund authored and mchehab committed Apr 20, 2018
1 parent 4394eb2 commit 90dedce
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
37 changes: 37 additions & 0 deletions drivers/media/platform/rcar-vin/rcar-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/pm_runtime.h>

#include <media/videobuf2-dma-contig.h>

Expand Down Expand Up @@ -1157,3 +1158,39 @@ int rvin_dma_register(struct rvin_dev *vin, int irq)

return ret;
}

/* -----------------------------------------------------------------------------
* Gen3 CHSEL manipulation
*/

/*
* There is no need to have locking around changing the routing
* as it's only possible to do so when no VIN in the group is
* streaming so nothing can race with the VNMC register.
*/
int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel)
{
u32 ifmd, vnmc;
int ret;

ret = pm_runtime_get_sync(vin->dev);
if (ret < 0)
return ret;

/* Make register writes take effect immediately. */
vnmc = rvin_read(vin, VNMC_REG);
rvin_write(vin, vnmc & ~VNMC_VUP, VNMC_REG);

ifmd = VNCSI_IFMD_DES1 | VNCSI_IFMD_DES0 | VNCSI_IFMD_CSI_CHSEL(chsel);

rvin_write(vin, ifmd, VNCSI_IFMD_REG);

vin_dbg(vin, "Set IFMD 0x%x\n", ifmd);

/* Restore VNMC. */
rvin_write(vin, vnmc, VNMC_REG);

pm_runtime_put(vin->dev);

return ret;
}
2 changes: 2 additions & 0 deletions drivers/media/platform/rcar-vin/rcar-vin.h
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,6 @@ const struct rvin_video_format *rvin_format_from_pixel(u32 pixelformat);
/* Cropping, composing and scaling */
void rvin_crop_scale_comp(struct rvin_dev *vin);

int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel);

#endif

0 comments on commit 90dedce

Please sign in to comment.