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

Commit 2bd6ce84 authored by Dave Airlie's avatar Dave Airlie
Browse files

qxl: split monitors_config object creation out. 



This splits the creation of the monitors config object out so we can
re-use it across suspend/resume later.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c9272155

drivers/gpu/drm/qxl/qxl_display.c

+50 −4
Original line number Diff line number Diff line
@@ -872,16 +872,14 @@ static const struct drm_mode_config_funcs qxl_mode_funcs = { 
	.fb_create = qxl_user_framebuffer_create,

};



int qxl_modeset_init(struct qxl_device *qdev)

int qxl_create_monitors_object(struct qxl_device *qdev)

{

	int i;

	int ret;

	struct drm_gem_object *gobj;

	int max_allowed = qxl_num_crtc;

	int monitors_config_size = sizeof(struct qxl_monitors_config) +

		max_allowed * sizeof(struct qxl_head);



	drm_mode_config_init(qdev->ddev);

	ret = qxl_gem_object_create(qdev, monitors_config_size, 0,

				    QXL_GEM_DOMAIN_VRAM,

				    false, false, NULL, &gobj);
@@ -890,13 +888,59 @@ int qxl_modeset_init(struct qxl_device *qdev) 
		return -ENOMEM;

	}

	qdev->monitors_config_bo = gem_to_qxl_bo(gobj);



	ret = qxl_bo_reserve(qdev->monitors_config_bo, false);

	if (ret)

		return ret;



	ret = qxl_bo_pin(qdev->monitors_config_bo, QXL_GEM_DOMAIN_VRAM, NULL);

	if (ret) {

		qxl_bo_unreserve(qdev->monitors_config_bo);

		return ret;

	}



	qxl_bo_unreserve(qdev->monitors_config_bo);



	qxl_bo_kmap(qdev->monitors_config_bo, NULL);



	qdev->monitors_config = qdev->monitors_config_bo->kptr;

	qdev->ram_header->monitors_config =

		qxl_bo_physical_address(qdev, qdev->monitors_config_bo, 0);



	memset(qdev->monitors_config, 0, monitors_config_size);

	qdev->monitors_config->max_allowed = max_allowed;

	return 0;

}



int qxl_destroy_monitors_object(struct qxl_device *qdev)

{

	int ret;



	qdev->monitors_config = NULL;

	qdev->ram_header->monitors_config = 0;



	qxl_bo_kunmap(qdev->monitors_config_bo);

	ret = qxl_bo_reserve(qdev->monitors_config_bo, false);

	if (ret)

		return ret;



	qxl_bo_unpin(qdev->monitors_config_bo);

	qxl_bo_unreserve(qdev->monitors_config_bo);



	qxl_bo_unref(&qdev->monitors_config_bo);

	return 0;

}



int qxl_modeset_init(struct qxl_device *qdev)

{

	int i;

	int ret;



	drm_mode_config_init(qdev->ddev);



	ret = qxl_create_monitors_object(qdev);

	if (ret)

		return ret;



	qdev->ddev->mode_config.funcs = (void *)&qxl_mode_funcs;
@@ -924,6 +968,8 @@ int qxl_modeset_init(struct qxl_device *qdev) 
void qxl_modeset_fini(struct qxl_device *qdev)

{

	qxl_fbdev_fini(qdev);



	qxl_destroy_monitors_object(qdev);

	if (qdev->mode_info.mode_config_initialized) {

		drm_mode_config_cleanup(qdev->ddev);

		qdev->mode_info.mode_config_initialized = false;

drivers/gpu/drm/qxl/qxl_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -374,6 +374,8 @@ qxl_framebuffer_init(struct drm_device *dev, 
		     struct drm_gem_object *obj);

void qxl_display_read_client_monitors_config(struct qxl_device *qdev);

void qxl_send_monitors_config(struct qxl_device *qdev);

int qxl_create_monitors_object(struct qxl_device *qdev);

int qxl_destroy_monitors_object(struct qxl_device *qdev);



/* used by qxl_debugfs only */

void qxl_crtc_set_from_monitors_config(struct qxl_device *qdev);