Merge tag 'drm-fixes-5.3-2019-08-14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2f62c5d6) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4869,7 +4869,7 @@ static void gfx_v9_0_ring_soft_recovery(struct amdgpu_ring *ring, unsigned vmid)
	value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);		value = REG_SET_FIELD(value, SQ_CMD, MODE, 0x01);
	value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);		value = REG_SET_FIELD(value, SQ_CMD, CHECK_VMID, 1);
	value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);		value = REG_SET_FIELD(value, SQ_CMD, VM_ID, vmid);
	WREG32(mmSQ_CMD, value);		WREG32_SOC15(GC, 0, mmSQ_CMD, value);
	}		}

	static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,		static void gfx_v9_0_set_gfx_eop_interrupt_state(struct amdgpu_device *adev,

drivers/gpu/drm/amd/display/dc/core/dc.c

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	*/		*/

	#include <linux/slab.h>		#include <linux/slab.h>
			#include <linux/mm.h>

	#include "dm_services.h"		#include "dm_services.h"

	@@ -1171,7 +1172,7 @@ bool dc_post_update_surfaces_to_stream(struct dc *dc)

	struct dc_state dc_create_state(struct dc dc)		struct dc_state dc_create_state(struct dc dc)
	{		{
	struct dc_state *context = kzalloc(sizeof(struct dc_state),		struct dc_state *context = kvzalloc(sizeof(struct dc_state),
	GFP_KERNEL);		GFP_KERNEL);

	if (!context)		if (!context)
	@@ -1192,11 +1193,11 @@ struct dc_state dc_create_state(struct dc dc)
	struct dc_state dc_copy_state(struct dc_state src_ctx)		struct dc_state dc_copy_state(struct dc_state src_ctx)
	{		{
	int i, j;		int i, j;
	struct dc_state *new_ctx = kmemdup(src_ctx,		struct dc_state *new_ctx = kvmalloc(sizeof(struct dc_state), GFP_KERNEL);
	sizeof(struct dc_state), GFP_KERNEL);

	if (!new_ctx)		if (!new_ctx)
	return NULL;		return NULL;
			memcpy(new_ctx, src_ctx, sizeof(struct dc_state));

	for (i = 0; i < MAX_PIPES; i++) {		for (i = 0; i < MAX_PIPES; i++) {
	struct pipe_ctx *cur_pipe = &new_ctx->res_ctx.pipe_ctx[i];		struct pipe_ctx *cur_pipe = &new_ctx->res_ctx.pipe_ctx[i];
	@@ -1230,7 +1231,7 @@ static void dc_state_free(struct kref *kref)
	{		{
	struct dc_state *context = container_of(kref, struct dc_state, refcount);		struct dc_state *context = container_of(kref, struct dc_state, refcount);
	dc_resource_state_destruct(context);		dc_resource_state_destruct(context);
	kfree(context);		kvfree(context);
	}		}

	void dc_release_state(struct dc_state *context)		void dc_release_state(struct dc_state *context)

drivers/gpu/drm/scheduler/sched_entity.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -95,7 +95,7 @@ static bool drm_sched_entity_is_idle(struct drm_sched_entity *entity)
	rmb(); /* for list_empty to work without lock */		rmb(); /* for list_empty to work without lock */

	if (list_empty(&entity->list) \|\|		if (list_empty(&entity->list) \|\|
	spsc_queue_peek(&entity->job_queue) == NULL)		spsc_queue_count(&entity->job_queue) == 0)
	return true;		return true;

	return false;		return false;
	@@ -281,7 +281,7 @@ void drm_sched_entity_fini(struct drm_sched_entity *entity)
	/* Consumption of existing IBs wasn't completed. Forcefully		/* Consumption of existing IBs wasn't completed. Forcefully
	* remove them here.		* remove them here.
	*/		*/
	if (spsc_queue_peek(&entity->job_queue)) {		if (spsc_queue_count(&entity->job_queue)) {
	if (sched) {		if (sched) {
	/* Park the kernel for a moment to make sure it isn't processing		/* Park the kernel for a moment to make sure it isn't processing
	* our enity.		* our enity.

Admin message