Merge branch 'drm-fixes-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (f21492d3) · Commits · 戴 / test

drivers/gpu/drm/scheduler/sched_main.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -366,10 +366,9 @@ void drm_sched_increase_karma(struct drm_sched_job *bad)
		EXPORT_SYMBOL(drm_sched_increase_karma);

		/**
		* drm_sched_hw_job_reset - stop the scheduler if it contains the bad job
		* drm_sched_stop - stop the scheduler
		*
		* @sched: scheduler instance
		* @bad: bad scheduler job
		*
		*/
		void drm_sched_stop(struct drm_gpu_scheduler *sched)

+5 −5

Original line number	Diff line number	Diff line
		@@ -49,9 +49,8 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj);
		* ttm_global_mutex - protecting the global BO state
		*/
		DEFINE_MUTEX(ttm_global_mutex);
		struct ttm_bo_global ttm_bo_glob = {
		.use_count = 0
		};
		unsigned ttm_bo_glob_use_count;
		struct ttm_bo_global ttm_bo_glob;

		static struct attribute ttm_bo_count = {
		.name = "bo_count",
		@@ -1531,12 +1530,13 @@ static void ttm_bo_global_release(void)
		struct ttm_bo_global *glob = &ttm_bo_glob;

		mutex_lock(&ttm_global_mutex);
		if (--glob->use_count > 0)
		if (--ttm_bo_glob_use_count > 0)
		goto out;

		kobject_del(&glob->kobj);
		kobject_put(&glob->kobj);
		ttm_mem_global_release(&ttm_mem_glob);
		memset(glob, 0, sizeof(*glob));
		out:
		mutex_unlock(&ttm_global_mutex);
		}
		@@ -1548,7 +1548,7 @@ static int ttm_bo_global_init(void)
		unsigned i;

		mutex_lock(&ttm_global_mutex);
		if (++glob->use_count > 1)
		if (++ttm_bo_glob_use_count > 1)
		goto out;

		ret = ttm_mem_global_init(&ttm_mem_glob);

+3 −2

Original line number	Diff line number	Diff line
		@@ -461,8 +461,8 @@ out_no_zone:

		void ttm_mem_global_release(struct ttm_mem_global *glob)
		{
		unsigned int i;
		struct ttm_mem_zone *zone;
		unsigned int i;

		/* let the page allocator first stop the shrink work. */
		ttm_page_alloc_fini();
		@@ -478,6 +478,7 @@ void ttm_mem_global_release(struct ttm_mem_global *glob)
		}
		kobject_del(&glob->kobj);
		kobject_put(&glob->kobj);
		memset(glob, 0, sizeof(*glob));
		}

		static void ttm_check_swapping(struct ttm_mem_global *glob)

+0 −1

Original line number	Diff line number	Diff line
		@@ -420,7 +420,6 @@ extern struct ttm_bo_global {
		/**
		* Protected by ttm_global_mutex.
		*/
		unsigned int use_count;
		struct list_head device_list;

		/**