]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/vmwgfx: Update comments for sou plane update function
authorDeepak Rawat <drawat@vmware.com>
Fri, 21 Sep 2018 21:10:35 +0000 (14:10 -0700)
committerThomas Hellstrom <thellstrom@vmware.com>
Wed, 5 Dec 2018 09:00:41 +0000 (10:00 +0100)
Update comments to sync with code.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

index 0bca79caf96a89bb9ec6b0ea1d2e7de2a3cc0cd9..5a193eb6c4b897205e43b8fdcdd1011dc15e8df6 100644 (file)
@@ -770,6 +770,7 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane,
        struct vmw_fence_obj *fence = NULL;
        int ret;
 
+       /* In case of device error, maintain consistent atomic state */
        if (crtc && plane->state->fb) {
                struct vmw_private *dev_priv = vmw_priv(crtc->dev);
                struct vmw_framebuffer *vfb =
@@ -782,28 +783,15 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane,
                        ret = vmw_sou_plane_update_surface(dev_priv, plane,
                                                           old_state, vfb,
                                                           &fence);
-
-               /*
-                * We cannot really fail this function, so if we do, then output
-                * an error and maintain consistent atomic state.
-                */
                if (ret != 0)
                        DRM_ERROR("Failed to update screen.\n");
        } else {
-               /*
-                * When disabling a plane, CRTC and FB should always be NULL
-                * together, otherwise it's an error.
-                * Here primary plane is being disable so should really blank
-                * the screen object display unit, if not already done.
-                */
+               /* Do nothing when fb and crtc is NULL (blank crtc) */
                return;
        }
 
+       /* For error case vblank event is send from vmw_du_crtc_atomic_flush */
        event = crtc->state->event;
-       /*
-        * In case of failure and other cases, vblank event will be sent in
-        * vmw_du_crtc_atomic_flush.
-        */
        if (event && fence) {
                struct drm_file *file_priv = event->base.file_priv;