diff options
| author | Kamil Debski <k.debski@samsung.com> | 2012-06-08 04:46:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-18 19:44:46 -0300 |
| commit | 4e6bb2a5fb9265a222e3a86b215f4c5e6bcd61de (patch) | |
| tree | bba2da01b85fe52dc6728d01c767bfc3beba7377 /drivers/media/video/s5p-mfc/s5p_mfc_opr.h | |
| parent | cba5d0b20e7c75dc06e3a609059f17f11c843d94 (diff) | |
[media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
Fixed the code copying timecode/timestamp to corresponding
frames between OUTPUT and CAPTURE.
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-mfc/s5p_mfc_opr.h')
| -rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc_opr.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h index db83836e6a9..5932d1c782c 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h @@ -57,10 +57,12 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq); S5P_FIMV_SI_DISPLAY_Y_ADR) << \ MFC_OFFSET_SHIFT) #define s5p_mfc_get_dec_y_adr() (readl(dev->regs_base + \ - S5P_FIMV_SI_DISPLAY_Y_ADR) << \ + S5P_FIMV_SI_DECODE_Y_ADR) << \ MFC_OFFSET_SHIFT) #define s5p_mfc_get_dspl_status() readl(dev->regs_base + \ S5P_FIMV_SI_DISPLAY_STATUS) +#define s5p_mfc_get_dec_status() readl(dev->regs_base + \ + S5P_FIMV_SI_DECODE_STATUS) #define s5p_mfc_get_frame_type() (readl(dev->regs_base + \ S5P_FIMV_DECODE_FRAME_TYPE) \ & S5P_FIMV_DECODE_FRAME_MASK) |