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

Commit 894219d7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'vmwgfx-fixes-4.15' of git://people.freedesktop.org/~thomash/linux into drm-fixes 

Last minute fixes for vmwgfx.
One fix for a drm helper warning introduced in 4.15
One important fix for a longer standing memory corruption issue on older
hardware versions.

* 'vmwgfx-fixes-4.15' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: fix memory corruption with legacy/sou connectors
  drm/vmwgfx: Fix a boot time warning
parents a8750ddc 8a510a5c

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ u32 vmw_get_vblank_counter(struct drm_device *dev, unsigned int pipe) 
 */

int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)

{

	return -ENOSYS;

	return -EINVAL;

}



/**

drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c

+2 −2
Original line number Diff line number Diff line
@@ -266,8 +266,8 @@ static const struct drm_connector_funcs vmw_legacy_connector_funcs = { 
	.set_property = vmw_du_connector_set_property,

	.destroy = vmw_ldu_connector_destroy,

	.reset = vmw_du_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = vmw_du_connector_duplicate_state,

	.atomic_destroy_state = vmw_du_connector_destroy_state,

	.atomic_set_property = vmw_du_connector_atomic_set_property,

	.atomic_get_property = vmw_du_connector_atomic_get_property,

};

drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c

+2 −2
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ static const struct drm_connector_funcs vmw_sou_connector_funcs = { 
	.set_property = vmw_du_connector_set_property,

	.destroy = vmw_sou_connector_destroy,

	.reset = vmw_du_connector_reset,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

	.atomic_duplicate_state = vmw_du_connector_duplicate_state,

	.atomic_destroy_state = vmw_du_connector_destroy_state,

	.atomic_set_property = vmw_du_connector_atomic_set_property,

	.atomic_get_property = vmw_du_connector_atomic_get_property,

};