drm/qxl: rework to new fence interface (2f453ed4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/gpu/drm/qxl/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,6 +4,6 @@

		ccflags-y := -Iinclude/drm

		qxl-y := qxl_drv.o qxl_kms.o qxl_display.o qxl_ttm.o qxl_fb.o qxl_object.o qxl_gem.o qxl_cmd.o qxl_image.o qxl_draw.o qxl_debugfs.o qxl_irq.o qxl_dumb.o qxl_ioctl.o qxl_fence.o qxl_release.o
		qxl-y := qxl_drv.o qxl_kms.o qxl_display.o qxl_ttm.o qxl_fb.o qxl_object.o qxl_gem.o qxl_cmd.o qxl_image.o qxl_draw.o qxl_debugfs.o qxl_irq.o qxl_dumb.o qxl_ioctl.o qxl_release.o

		obj-$(CONFIG_DRM_QXL)+= qxl.o

drivers/gpu/drm/qxl/qxl_cmd.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -620,11 +620,6 @@ static int qxl_reap_surf(struct qxl_device qdev, struct qxl_bo surf, bool stal
		if (ret == -EBUSY)
		return -EBUSY;

		if (surf->fence.num_active_releases > 0 && stall == false) {
		qxl_bo_unreserve(surf);
		return -EBUSY;
		}

		if (stall)
		mutex_unlock(&qdev->surf_evict_mutex);

drivers/gpu/drm/qxl/qxl_debugfs.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -57,11 +57,21 @@ qxl_debugfs_buffers_info(struct seq_file m, void data)
		struct qxl_device *qdev = node->minor->dev->dev_private;
		struct qxl_bo *bo;

		spin_lock(&qdev->release_lock);
		list_for_each_entry(bo, &qdev->gem.objects, list) {
		struct reservation_object_list *fobj;
		int rel;

		rcu_read_lock();
		fobj = rcu_dereference(bo->tbo.resv->fence);
		rel = fobj ? fobj->shared_count : 0;
		rcu_read_unlock();

		seq_printf(m, "size %ld, pc %d, sync obj %p, num releases %d\n",
		(unsigned long)bo->gem_base.size, bo->pin_count,
		bo->tbo.sync_obj, bo->fence.num_active_releases);
		bo->tbo.sync_obj, rel);
		}
		spin_unlock(&qdev->release_lock);
		return 0;
		}

drivers/gpu/drm/qxl/qxl_drv.h

+8 −14

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		* Definitions taken from spice-protocol, plus kernel driver specific bits.
		*/

		#include <linux/fence.h>
		#include <linux/workqueue.h>
		#include <linux/firmware.h>
		#include <linux/platform_device.h>
		@@ -95,13 +96,6 @@ enum {
		QXL_INTERRUPT_IO_CMD \|\
		QXL_INTERRUPT_CLIENT_MONITORS_CONFIG)

		struct qxl_fence {
		struct qxl_device *qdev;
		uint32_t num_active_releases;
		uint32_t *release_ids;
		struct radix_tree_root tree;
		};

		struct qxl_bo {
		/* Protected by gem.mutex */
		struct list_head list;
		@@ -113,13 +107,13 @@ struct qxl_bo {
		unsigned pin_count;
		void *kptr;
		int type;

		/* Constant after initialization */
		struct drm_gem_object gem_base;
		bool is_primary; /* is this now a primary surface */
		bool hw_surf_alloc;
		struct qxl_surface surf;
		uint32_t surface_id;
		struct qxl_fence fence; /* per bo fence - list of releases */
		struct qxl_release *surf_create;
		};
		#define gem_to_qxl_bo(gobj) container_of((gobj), struct qxl_bo, gem_base)
		@@ -191,6 +185,8 @@ enum {
		* spice-protocol/qxl_dev.h */
		#define QXL_MAX_RES 96
		struct qxl_release {
		struct fence base;

		int id;
		int type;
		uint32_t release_offset;
		@@ -284,7 +280,11 @@ struct qxl_device {
		uint8_t slot_gen_bits;
		uint64_t va_slot_mask;

		/* XXX: when rcu becomes available, release_lock can be killed */
		spinlock_t release_lock;
		spinlock_t fence_lock;
		struct idr release_idr;
		uint32_t release_seqno;
		spinlock_t release_idr_lock;
		struct mutex async_io_mutex;
		unsigned int last_sent_io_cmd;
		@@ -561,10 +561,4 @@ qxl_surface_lookup(struct drm_device *dev, int surface_id);
		void qxl_surface_evict(struct qxl_device qdev, struct qxl_bo surf, bool freeing);
		int qxl_update_surface(struct qxl_device qdev, struct qxl_bo surf);

		/* qxl_fence.c */
		void qxl_fence_add_release_locked(struct qxl_fence *qfence, uint32_t rel_id);
		int qxl_fence_remove_release(struct qxl_fence *qfence, uint32_t rel_id);
		int qxl_fence_init(struct qxl_device qdev, struct qxl_fence qfence);
		void qxl_fence_fini(struct qxl_fence *qfence);

		#endif

drivers/gpu/drm/qxl/qxl_fence.c

deleted100644 → 0

+0 −87

Original line number	Diff line number	Diff line
		/*
		* Copyright 2013 Red Hat Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Authors: Dave Airlie
		* Alon Levy
		*/


		#include "qxl_drv.h"

		/* QXL fencing-

		When we submit operations to the GPU we pass a release reference to the GPU
		with them, the release reference is then added to the release ring when
		the GPU is finished with that particular operation and has removed it from
		its tree.

		So we have can have multiple outstanding non linear fences per object.

		From a TTM POV we only care if the object has any outstanding releases on
		it.

		we wait until all outstanding releases are processeed.

		sync object is just a list of release ids that represent that fence on
		that buffer.

		we just add new releases onto the sync object attached to the object.

		This currently uses a radix tree to store the list of release ids.

		For some reason every so often qxl hw fails to release, things go wrong.
		*/
		/* must be called with the fence lock held */
		void qxl_fence_add_release_locked(struct qxl_fence *qfence, uint32_t rel_id)
		{
		radix_tree_insert(&qfence->tree, rel_id, qfence);
		qfence->num_active_releases++;
		}

		int qxl_fence_remove_release(struct qxl_fence *qfence, uint32_t rel_id)
		{
		void *ret;
		int retval = 0;

		ret = radix_tree_delete(&qfence->tree, rel_id);
		if (ret == qfence)
		qfence->num_active_releases--;
		else {
		DRM_DEBUG("didn't find fence in radix tree for %d\n", rel_id);
		retval = -ENOENT;
		}
		return retval;
		}


		int qxl_fence_init(struct qxl_device qdev, struct qxl_fence qfence)
		{
		qfence->qdev = qdev;
		qfence->num_active_releases = 0;
		INIT_RADIX_TREE(&qfence->tree, GFP_ATOMIC);
		return 0;
		}

		void qxl_fence_fini(struct qxl_fence *qfence)
		{
		kfree(qfence->release_ids);
		qfence->num_active_releases = 0;
		}