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

[linux-2.6-microblaze.git] / drivers / media / platform / vsp1 / vsp1_drm.c

diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
index a99fc0c..b9c0f69 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drm.c
+++ b/drivers/media/platform/vsp1/vsp1_drm.c
@@ -670,9 +670,11 @@ int vsp1_du_setup_lif(struct device *dev, unsigned int pipe_index,
 
        drm_pipe->width = cfg->width;
        drm_pipe->height = cfg->height;
+       pipe->interlaced = cfg->interlaced;
 
-       dev_dbg(vsp1->dev, "%s: configuring LIF%u with format %ux%u\n",
-               __func__, pipe_index, cfg->width, cfg->height);
+       dev_dbg(vsp1->dev, "%s: configuring LIF%u with format %ux%u%s\n",
+               __func__, pipe_index, cfg->width, cfg->height,
+               pipe->interlaced ? "i" : "");
 
        mutex_lock(&vsp1->drm->lock);
 
@@ -803,7 +805,7 @@ int vsp1_du_atomic_update(struct device *dev, unsigned int pipe_index,
         */
        fmtinfo = vsp1_get_format_info(vsp1, cfg->pixelformat);
        if (!fmtinfo) {
-               dev_dbg(vsp1->dev, "Unsupport pixel format %08x for RPF\n",
+               dev_dbg(vsp1->dev, "Unsupported pixel format %08x for RPF\n",
                        cfg->pixelformat);
                return -EINVAL;
        }