redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

drm/vmwgfx: Update comments for sou plane update function

Browse source 
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>
This commit is contained in:
Deepak Rawat 2018-09-21 14:10:35 -07:00 committed by Thomas Hellstrom
parent 67a51b3d98
commit 31da2df8ce
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
View file

@ -770,6 +770,7 @@ vmw_sou_primary_plane_atomic_update(struct drm_plane *plane,
struct vmw_fence_obj *fence = NULL; struct vmw_fence_obj *fence = NULL;
int ret; int ret;
/* In case of device error, maintain consistent atomic state */
if (crtc && plane->state->fb) { if (crtc && plane->state->fb) {
struct vmw_private *dev_priv = vmw_priv(crtc->dev); struct vmw_private *dev_priv = vmw_priv(crtc->dev);
struct vmw_framebuffer *vfb = 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, ret = vmw_sou_plane_update_surface(dev_priv, plane,
old_state, vfb, old_state, vfb,
&fence); &fence);
/*
* We cannot really fail this function, so if we do, then output
* an error and maintain consistent atomic state.
*/
if (ret != 0) if (ret != 0)
DRM_ERROR("Failed to update screen.\n"); DRM_ERROR("Failed to update screen.\n");
} else { } else {
/* /* Do nothing when fb and crtc is NULL (blank crtc) */
* 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.
*/
return; return;
} }
/* For error case vblank event is send from vmw_du_crtc_atomic_flush */
event = crtc->state->event; 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) { if (event && fence) {
struct drm_file *file_priv = event->base.file_priv; struct drm_file *file_priv = event->base.file_priv;