Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58aec872 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes 

Single vmwgfx fix.

* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
  drm/vmwgfx: Fix F26 Wayland screen update issue
parents e38f5164 021aba76

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+25 −1
Original line number Diff line number Diff line
@@ -1567,10 +1567,34 @@ vmw_kms_atomic_check_modeset(struct drm_device *dev, 
}





/**

 * vmw_kms_atomic_commit - Perform an atomic state commit

 *

 * @dev: DRM device

 * @state: the driver state object

 * @nonblock: Whether nonblocking behaviour is requested

 *

 * This is a simple wrapper around drm_atomic_helper_commit() for

 * us to clear the nonblocking value.

 *

 * Nonblocking commits currently cause synchronization issues

 * for vmwgfx.

 *

 * RETURNS

 * Zero for success or negative error code on failure.

 */

int vmw_kms_atomic_commit(struct drm_device *dev,

			  struct drm_atomic_state *state,

			  bool nonblock)

{

	return drm_atomic_helper_commit(dev, state, false);

}





static const struct drm_mode_config_funcs vmw_kms_funcs = {

	.fb_create = vmw_kms_fb_create,

	.atomic_check = vmw_kms_atomic_check_modeset,

	.atomic_commit = drm_atomic_helper_commit,

	.atomic_commit = vmw_kms_atomic_commit,

};



static int vmw_kms_generic_present(struct vmw_private *dev_priv,