Merge tag 'drm-misc-next-2022-06-08' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / rockchip / rockchip_drm_vop2.c

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
index 26ac91db0f35ba37ae3b190e060f452f5ef16739..6b72894e02d40323147c2a15304deb7d418b75a6 100644 (file)
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
@@ -1202,7 +1202,7 @@ static void vop2_plane_atomic_update(struct drm_plane *plane,
                 */
                stride = (fb->pitches[0] << 3) / bpp;
                if ((stride & 0x3f) && (xmirror || rotate_90 || rotate_270))
-                       drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligened\n",
+                       drm_err(vop2->drm, "vp%d %s stride[%d] not 64 pixel aligned\n",
                                vp->id, win->data->name, stride);
 
                rb_swap = vop2_afbc_rb_swap(fb->format->format);
@@ -1473,7 +1473,7 @@ static void rk3568_set_intf_mux(struct vop2_video_port *vp, int id,
        default:
                drm_err(vop2->drm, "Invalid interface id %d on vp%d\n", id, vp->id);
                return;
-       };
+       }
 
        dip |= RK3568_DSP_IF_POL__CFG_DONE_IMD;
 
@@ -1524,6 +1524,7 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc,
        if (ret < 0) {
                drm_err(vop2->drm, "failed to enable dclk for video port%d - %d\n",
                        vp->id, ret);
+               vop2_unlock(vop2);
                return;
        }