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

Commit b2b4465d authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

drm/qxl: drop active_user_framebuffer as its unneeded 



This was a bogus way to figure out what the active framebuffer was,
just check if the underlying bo is the primary bo.

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

drivers/gpu/drm/qxl/qxl_display.c

+4 −12
Original line number Diff line number Diff line
@@ -428,10 +428,10 @@ static int qxl_framebuffer_surface_dirty(struct drm_framebuffer *fb, 
	int inc = 1;



	qobj = gem_to_qxl_bo(qxl_fb->obj);

	if (qxl_fb != qdev->active_user_framebuffer) {

		DRM_INFO("%s: qxl_fb 0x%p != qdev->active_user_framebuffer 0x%p\n",

			__func__, qxl_fb, qdev->active_user_framebuffer);

	}

	/* if we aren't primary surface ignore this */

	if (!qobj->is_primary)

		return 0;



	if (!num_clips) {

		num_clips = 1;

		clips = &norect;
@@ -892,7 +892,6 @@ qxl_user_framebuffer_create(struct drm_device *dev, 
{

	struct drm_gem_object *obj;

	struct qxl_framebuffer *qxl_fb;

	struct qxl_device *qdev = dev->dev_private;

	int ret;



	obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
@@ -908,13 +907,6 @@ qxl_user_framebuffer_create(struct drm_device *dev, 
		return NULL;

	}



	if (qdev->active_user_framebuffer) {

		DRM_INFO("%s: active_user_framebuffer %p -> %p\n",

			 __func__,

			 qdev->active_user_framebuffer, qxl_fb);

	}

	qdev->active_user_framebuffer = qxl_fb;



	return &qxl_fb->base;

}

drivers/gpu/drm/qxl/qxl_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -255,12 +255,6 @@ struct qxl_device { 
	struct qxl_gem		gem;

	struct qxl_mode_info mode_info;



	/*

	 * last created framebuffer with fb_create

	 * only used by debugfs dumbppm

	 */

	struct qxl_framebuffer *active_user_framebuffer;



	struct fb_info			*fbdev_info;

	struct qxl_framebuffer	*fbdev_qfb;

	void *ram_physical;