Commit 47e0cd6b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-next 

A few fixes for 4.14.  Nothing too major.
parents 7846b12f 3d138c14

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
extern int amdgpu_modeset;

extern int amdgpu_vram_limit;

extern int amdgpu_vis_vram_limit;

extern unsigned amdgpu_gart_size;

extern int amdgpu_gart_size;

extern int amdgpu_gtt_size;

extern int amdgpu_moverate;

extern int amdgpu_benchmarking;

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

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ static const struct kfd2kgd_calls kfd2kgd = { 
struct kfd2kgd_calls *amdgpu_amdkfd_gfx_8_0_get_functions(void)

{

	return (struct kfd2kgd_calls *)&kfd2kgd;

	return (struct kfd2kgd_calls *)&kfd2kgd;

}



static inline struct amdgpu_device *get_amdgpu_device(struct kgd_dev *kgd)

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

+3 −4
Original line number Diff line number Diff line
@@ -1079,6 +1079,9 @@ static int amdgpu_cs_process_syncobj_out_dep(struct amdgpu_cs_parser *p, 
					     GFP_KERNEL);

	p->num_post_dep_syncobjs = 0;



	if (!p->post_dep_syncobjs)

		return -ENOMEM;



	for (i = 0; i < num_deps; ++i) {

		p->post_dep_syncobjs[i] = drm_syncobj_find(p->filp, deps[i].handle);

		if (!p->post_dep_syncobjs[i])
@@ -1150,7 +1153,6 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, 
	cs->out.handle = amdgpu_ctx_add_fence(p->ctx, ring, p->fence);

	job->uf_sequence = cs->out.handle;

	amdgpu_job_free_resources(job);

	amdgpu_cs_parser_fini(p, 0, true);



	trace_amdgpu_cs_ioctl(job);

	amd_sched_entity_push_job(&job->base);
@@ -1208,10 +1210,7 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		goto out;



	r = amdgpu_cs_submit(&parser, cs);

	if (r)

		goto out;



	return 0;

out:

	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);

	return r;

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

+2 −8
Original line number Diff line number Diff line
@@ -1062,11 +1062,11 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) 
		amdgpu_sched_jobs = roundup_pow_of_two(amdgpu_sched_jobs);

	}



	if (amdgpu_gart_size < 32) {

	if (amdgpu_gart_size != -1 && amdgpu_gart_size < 32) {

		/* gart size must be greater or equal to 32M */

		dev_warn(adev->dev, "gart size (%d) too small\n",

			 amdgpu_gart_size);

		amdgpu_gart_size = 32;

		amdgpu_gart_size = -1;

	}



	if (amdgpu_gtt_size != -1 && amdgpu_gtt_size < 32) {
@@ -2622,12 +2622,6 @@ static int amdgpu_recover_vram_from_shadow(struct amdgpu_device *adev, 
			goto err;

		}



		r = amdgpu_ttm_bind(&bo->shadow->tbo, &bo->shadow->tbo.mem);

		if (r) {

			DRM_ERROR("%p bind failed\n", bo->shadow);

			goto err;

		}



		r = amdgpu_bo_restore_from_shadow(adev, ring, bo,

						 NULL, fence, true);

		if (r) {

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

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 


int amdgpu_vram_limit = 0;

int amdgpu_vis_vram_limit = 0;

unsigned amdgpu_gart_size = 256;

int amdgpu_gart_size = -1; /* auto */

int amdgpu_gtt_size = -1; /* auto */

int amdgpu_moverate = -1; /* auto */

int amdgpu_benchmarking = 0;
@@ -128,7 +128,7 @@ module_param_named(vramlimit, amdgpu_vram_limit, int, 0600); 
MODULE_PARM_DESC(vis_vramlimit, "Restrict visible VRAM for testing, in megabytes");

module_param_named(vis_vramlimit, amdgpu_vis_vram_limit, int, 0444);



MODULE_PARM_DESC(gartsize, "Size of PCIE/IGP gart to setup in megabytes (32, 64, etc.)");

MODULE_PARM_DESC(gartsize, "Size of GART to setup in megabytes (32, 64, etc., -1=auto)");

module_param_named(gartsize, amdgpu_gart_size, uint, 0600);



MODULE_PARM_DESC(gttsize, "Size of the GTT domain in megabytes (-1 = auto)");