dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Deepak Rawat <drawat@vmware.com>
To: dri-devel@lists.freedesktop.org,
	linux-graphics-maintainer@vmware.com, thellstrom@vmware.com,
	syeh@vmware.com
Cc: Deepak Rawat <drawat@vmware.com>
Subject: [PATCH 15/18] drm/vmwgfx: Update comments for sou plane update function
Date: Thu, 27 Sep 2018 17:30:17 -0700	[thread overview]
Message-ID: <20180928003020.1737-15-drawat@vmware.com> (raw)
In-Reply-To: <20180928003020.1737-1-drawat@vmware.com>

Update comments to sync with code.

Signed-off-by: Deepak Rawat <drawat@vmware.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 8d8d61d6078f..9c3225e6bc1b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -826,6 +826,7 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane,
 	struct vmw_fence_obj *fence = NULL;
 	int ret;
 
+	/* If somehow gets a device error maintain consistent atomic state */
 	if (crtc && plane->state->fb) {
 		struct vmw_private *dev_priv = vmw_priv(crtc->dev);
 		struct vmw_framebuffer *vfb =
@@ -838,28 +839,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 sent 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;
 
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2018-09-28  0:30 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-28  0:30 [PATCH 01/18] drm: Add a new plane property to send damage during plane update Deepak Rawat
2018-09-28  0:30 ` [PATCH 02/18] drm: Add a new helper to validate damage during atomic_check Deepak Rawat
2018-09-28  0:30 ` [PATCH 03/18] drm: Add helper iterator functions for plane fb_damage_clips blob Deepak Rawat
2018-09-28  0:30 ` [PATCH 04/18] drm/selftest: Add drm damage helper selftest Deepak Rawat
2018-10-01  8:12   ` Daniel Vetter
2018-10-09 22:43     ` Deepak Singh Rawat
2018-10-11 16:17       ` Daniel Vetter
2018-09-28  0:30 ` [PATCH 05/18] drm: Add helper to implement legacy dirtyfb Deepak Rawat
2018-10-01  8:08   ` Daniel Vetter
2018-10-02 16:30     ` Deepak Singh Rawat
2018-10-03  8:45       ` Daniel Vetter
2018-09-28  0:30 ` [PATCH 06/18] drm/vmwgfx: Add a new interface for plane update on a display unit Deepak Rawat
2018-09-28  0:30 ` [PATCH 07/18] drm/vmwgfx: Implement STDU plane update for surface backed fb Deepak Rawat
2018-09-28  0:30 ` [PATCH 08/18] drm/vmwgfx: Implement STDU plane update for BO " Deepak Rawat
2018-09-28  0:30 ` [PATCH 09/18] drm/vmwgfx: Use the new interface for STDU plane update Deepak Rawat
2018-09-28  0:30 ` [PATCH 10/18] drm/vmwgfx: Updated comment for stdu " Deepak Rawat
2018-09-28  0:30 ` [PATCH 11/18] drm/vmwgfx: Enable FB_DAMAGE_CLIPS property for STDU primary plane Deepak Rawat
2018-09-28  0:30 ` [PATCH 12/18] drm/vmwgfx: Implement SOU plane update for surface backed fb Deepak Rawat
2018-09-28  0:30 ` [PATCH 13/18] drm/vmwgfx: Implement SOU plane update for BO " Deepak Rawat
2018-09-28  0:30 ` [PATCH 14/18] drm/vmwgfx: Use the new interface for SOU plane update Deepak Rawat
2018-09-28  0:30 ` Deepak Rawat [this message]
2018-09-28  0:30 ` [PATCH 16/18] drm/vmwgfx: Enable FB_DAMAGE_CLIPS property for SOU primary plane Deepak Rawat
2018-09-28  0:30 ` [PATCH 17/18] drm/vmwgfx: Use atomic helper function for dirty fb IOCTL Deepak Rawat
2018-09-28  0:30 ` [PATCH 18/18] drm/vmwgfx: Don't clear mode::type anymore Deepak Rawat

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180928003020.1737-15-drawat@vmware.com \
    --to=drawat@vmware.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-graphics-maintainer@vmware.com \
    --cc=syeh@vmware.com \
    --cc=thellstrom@vmware.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox