]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm/vmwgfx: Update comments for stdu plane update
authorDeepak Rawat <drawat@vmware.com>
Fri, 21 Sep 2018 20:46:42 +0000 (13:46 -0700)
committerThomas Hellstrom <thellstrom@vmware.com>
Wed, 5 Dec 2018 09:00:39 +0000 (10:00 +0100)
Update the 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_stdu.c

index 0dcaec59ebe87991892b143e96ec06deabe2e212..f6f788b4a19dc51d6edbd9975439380da88b9538 100644 (file)
@@ -1656,7 +1656,6 @@ static int vmw_stdu_plane_update_surface(struct vmw_private *dev_priv,
 
 /**
  * vmw_stdu_primary_plane_atomic_update - formally switches STDU to new plane
- *
  * @plane: display plane
  * @old_state: Only used to get crtc info
  *
@@ -1677,10 +1676,7 @@ vmw_stdu_primary_plane_atomic_update(struct drm_plane *plane,
        struct vmw_private *dev_priv;
        int ret;
 
-       /*
-        * We cannot really fail this function, so if we do, then output an
-        * error and maintain consistent atomic state.
-        */
+       /* If case of device error, maintain consistent atomic state */
        if (crtc && plane->state->fb) {
                struct vmw_framebuffer *vfb =
                        vmw_framebuffer_to_vfb(plane->state->fb);
@@ -1709,12 +1705,7 @@ vmw_stdu_primary_plane_atomic_update(struct drm_plane *plane,
                stdu = vmw_crtc_to_stdu(crtc);
                dev_priv = vmw_priv(crtc->dev);
 
-               /*
-                * When disabling a plane, CRTC and FB should always be NULL
-                * together, otherwise it's an error.
-                * Here primary plane is being disable so blank the screen
-                * target display unit, if not already done.
-                */
+               /* Blank STDU when fb and crtc are NULL */
                if (!stdu->defined)
                        return;
 
@@ -1729,11 +1720,8 @@ vmw_stdu_primary_plane_atomic_update(struct drm_plane *plane,
                return;
        }
 
+       /* In case of error, vblank event is send in 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;