drm/vmwgfx: Don't clear mode::type anymore (b4fa61ba) · Commits · 戴 / test

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

+0 −22

Original line number	Diff line number	Diff line
		@@ -2812,28 +2812,6 @@ vmw_kms_create_implicit_placement_property(struct vmw_private *dev_priv,

		}


		/**
		* vmw_kms_set_config - Wrapper around drm_atomic_helper_set_config
		*
		* @set: The configuration to set.
		*
		* The vmwgfx Xorg driver doesn't assign the mode::type member, which
		* when drm_mode_set_crtcinfo is called as part of the configuration setting
		* causes it to return incorrect crtc dimensions causing severe problems in
		* the vmwgfx modesetting. So explicitly clear that member before calling
		* into drm_atomic_helper_set_config.
		*/
		int vmw_kms_set_config(struct drm_mode_set *set,
		struct drm_modeset_acquire_ctx *ctx)
		{
		if (set && set->mode)
		set->mode->type = 0;

		return drm_atomic_helper_set_config(set, ctx);
		}


		/**
		* vmw_kms_suspend - Save modesetting state and turn modesetting off.
		*

+0 −3

Original line number	Diff line number	Diff line
		@@ -572,9 +572,6 @@ int vmw_kms_stdu_dma(struct vmw_private *dev_priv,
		bool interruptible,
		struct drm_crtc *crtc);

		int vmw_kms_set_config(struct drm_mode_set *set,
		struct drm_modeset_acquire_ctx *ctx);

		int vmw_du_helper_plane_update(struct vmw_du_update_plane *update);

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -233,7 +233,7 @@ static const struct drm_crtc_funcs vmw_legacy_crtc_funcs = {
		.reset = vmw_du_crtc_reset,
		.atomic_duplicate_state = vmw_du_crtc_duplicate_state,
		.atomic_destroy_state = vmw_du_crtc_destroy_state,
		.set_config = vmw_kms_set_config,
		.set_config = drm_atomic_helper_set_config,
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -353,7 +353,7 @@ static const struct drm_crtc_funcs vmw_screen_object_crtc_funcs = {
		.reset = vmw_du_crtc_reset,
		.atomic_duplicate_state = vmw_du_crtc_duplicate_state,
		.atomic_destroy_state = vmw_du_crtc_destroy_state,
		.set_config = vmw_kms_set_config,
		.set_config = drm_atomic_helper_set_config,
		.page_flip = vmw_sou_crtc_page_flip,
		};

+1 −1

Original line number	Diff line number	Diff line
		@@ -990,7 +990,7 @@ static const struct drm_crtc_funcs vmw_stdu_crtc_funcs = {
		.reset = vmw_du_crtc_reset,
		.atomic_duplicate_state = vmw_du_crtc_duplicate_state,
		.atomic_destroy_state = vmw_du_crtc_destroy_state,
		.set_config = vmw_kms_set_config,
		.set_config = drm_atomic_helper_set_config,
		.page_flip = vmw_stdu_crtc_page_flip,
		};