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

Commit 94249117 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.13-rc8' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Two fixes (a vmwgfx and core drm fix) in the queue for 4.13 final,
  hopefully that is it"

* tag 'drm-fixes-for-v4.13-rc8' of git://people.freedesktop.org/~airlied/linux:
  drm/vmwgfx: Fix F26 Wayland screen update issue
  drm/bridge/sii8620: Fix memory corruption
parents c02bf3e5 58aec872

drivers/gpu/drm/bridge/sil-sii8620.c

+2 −2
Original line number Diff line number Diff line
@@ -597,9 +597,9 @@ static void sii8620_mt_read_devcap(struct sii8620 *ctx, bool xdevcap) 
static void sii8620_mt_read_devcap_reg_recv(struct sii8620 *ctx,

		struct sii8620_mt_msg *msg)

{

	u8 reg = msg->reg[0] & 0x7f;

	u8 reg = msg->reg[1] & 0x7f;



	if (msg->reg[0] & 0x80)

	if (msg->reg[1] & 0x80)

		ctx->xdevcap[reg] = msg->ret;

	else

		ctx->devcap[reg] = msg->ret;

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,