Merge tag 'media/v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[sfrench/cifs-2.6.git] / drivers / media / platform / ti-vpe / vpdma.c

diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c
index 53d27cd6e10aee27756a96e0cfe46d0a89fc1a2a..2e5148ae7a0f14b67395c0bfd50e3582cd5d80ef 100644 (file)
--- a/drivers/media/platform/ti-vpe/vpdma.c
+++ b/drivers/media/platform/ti-vpe/vpdma.c
@@ -56,6 +56,11 @@ const struct vpdma_data_format vpdma_yuv_fmts[] = {
                .data_type      = DATA_TYPE_C420,
                .depth          = 4,
        },
+       [VPDMA_DATA_FMT_CB420] = {
+               .type           = VPDMA_DATA_FMT_TYPE_YUV,
+               .data_type      = DATA_TYPE_CB420,
+               .depth          = 4,
+       },
        [VPDMA_DATA_FMT_YCR422] = {
                .type           = VPDMA_DATA_FMT_TYPE_YUV,
                .data_type      = DATA_TYPE_YCR422,
@@ -759,7 +764,7 @@ static void dump_dtd(struct vpdma_dtd *dtd)
                pr_debug("word1: line_length = %d, xfer_height = %d\n",
                        dtd_get_line_length(dtd), dtd_get_xfer_height(dtd));
 
-       pr_debug("word2: start_addr = %pad\n", &dtd->start_addr);
+       pr_debug("word2: start_addr = %x\n", dtd->start_addr);
 
        pr_debug("word3: pkt_type = %d, mode = %d, dir = %d, chan = %d, pri = %d, next_chan = %d\n",
                 dtd_get_pkt_type(dtd),
@@ -825,7 +830,8 @@ void vpdma_rawchan_add_out_dtd(struct vpdma_desc_list *list, int width,
        channel = next_chan = raw_vpdma_chan;
 
        if (fmt->type == VPDMA_DATA_FMT_TYPE_YUV &&
-                       fmt->data_type == DATA_TYPE_C420) {
+           (fmt->data_type == DATA_TYPE_C420 ||
+            fmt->data_type == DATA_TYPE_CB420)) {
                rect.height >>= 1;
                rect.top >>= 1;
                depth = 8;
@@ -893,7 +899,8 @@ void vpdma_add_in_dtd(struct vpdma_desc_list *list, int width,
        channel = next_chan = chan_info[chan].num;
 
        if (fmt->type == VPDMA_DATA_FMT_TYPE_YUV &&
-                       fmt->data_type == DATA_TYPE_C420) {
+           (fmt->data_type == DATA_TYPE_C420 ||
+            fmt->data_type == DATA_TYPE_CB420)) {
                rect.height >>= 1;
                rect.top >>= 1;
                depth = 8;