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

Commit 67e2f0c8 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

staging: vboxvideo: Atomic phase 2: Wire up state object handlers 



Wire up state object handlers for the crtc-s and the planes, call
drm_mode_config_reset() after creating all the crtc-s and encoders and
remove the legacy drm_helper_disable_unused_functions() call.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cc0ec5eb

drivers/staging/vboxvideo/vbox_fb.c

+0 −3
Original line number Diff line number Diff line
@@ -216,9 +216,6 @@ int vbox_fbdev_init(struct vbox_private *vbox) 
	if (ret)

		goto err_fini;



	/* disable all the possible outputs/crtcs before entering KMS mode */

	drm_helper_disable_unused_functions(dev);



	ret = drm_fb_helper_initial_config(&fbdev->helper, 32);

	if (ret)

		goto err_fini;

drivers/staging/vboxvideo/vbox_mode.c

+10 −5
Original line number Diff line number Diff line
@@ -301,10 +301,6 @@ static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = { 
	.atomic_flush = vbox_crtc_atomic_flush,

};



static void vbox_crtc_reset(struct drm_crtc *crtc)

{

}



static void vbox_crtc_destroy(struct drm_crtc *crtc)

{

	drm_crtc_cleanup(crtc);
@@ -312,10 +308,12 @@ static void vbox_crtc_destroy(struct drm_crtc *crtc) 
}



static const struct drm_crtc_funcs vbox_crtc_funcs = {

	.reset = vbox_crtc_reset,

	.set_config = drm_crtc_helper_set_config,

	/* .gamma_set = vbox_crtc_gamma_set, */

	.destroy = vbox_crtc_destroy,

	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

};



static int vbox_primary_atomic_check(struct drm_plane *plane,
@@ -527,6 +525,9 @@ static const struct drm_plane_funcs vbox_cursor_plane_funcs = { 
	.update_plane	= drm_plane_helper_update,

	.disable_plane	= drm_plane_helper_disable,

	.destroy	= drm_primary_helper_destroy,

	.reset		= drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};



static const uint32_t vbox_primary_plane_formats[] = {
@@ -546,6 +547,9 @@ static const struct drm_plane_funcs vbox_primary_plane_funcs = { 
	.update_plane	= drm_plane_helper_update,

	.disable_plane	= drm_primary_helper_disable,

	.destroy	= drm_primary_helper_destroy,

	.reset		= drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};



static struct drm_plane *vbox_create_plane(struct vbox_private *vbox,
@@ -982,6 +986,7 @@ int vbox_mode_init(struct vbox_private *vbox) 
			goto err_drm_mode_cleanup;

	}



	drm_mode_config_reset(dev);

	return 0;



err_drm_mode_cleanup: