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

Commit 17f1dfd0 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- lots of code cleanup
- lots of bug fixes
- expose rpm based fan info via hwmon
- lots of clock and powergating fixes
- SI register header cleanup and conversion to common format used by newer asics

* 'drm-next-4.10' of git://people.freedesktop.org/~agd5f/linux: (54 commits)
  drm/amdgpu: drop is_display_hung from display funcs
  drm/amdgpu/uvd: reduce IB parsing overhead on UVD5+ (v2)
  drm/amdgpu/uvd: consolidate code for fetching addr from ctx
  drm/amdgpu: Disable DPM in virtualization
  drm/amdgpu: use AMDGPU_GEM_CREATE_VRAM_CLEARED for VM PD/PTs (v2)
  drm/amdgpu: improve AMDGPU_GEM_CREATE_VRAM_CLEARED handling (v2)
  drm/amdgpu: fix error handling in amdgpu_bo_create_restricted
  drm/amdgpu: fix amdgpu_fill_buffer (v2)
  drm/amdgpu: remove amdgpu_irq_get_delayed
  amdgpu: Wrap dev_err() calls on vm faults with printk_ratelimit()
  amdgpu: Use dev_err() over vanilla printk() in vm_decode_fault()
  drm/amd/amdgpu: port of DCE v6 to new headers (v3)
  drm/amdgpu: cleanup unused iterator members for sdma v2.4
  drm/amdgpu: cleanup unused iterator members for sdma v3
  drm/amdgpu:impl vgt_flush for VI(V5)
  drm/amdgpu: enable uvd mgcg for Fiji.
  drm/amdgpu: refine cz uvd clock gate logic.
  drm/amdgpu: change log level to KERN_INFO in ci_dpm.c
  drm/amdgpu: always un-gate UVD REGS path.
  drm/amdgpu/sdma: fix typo in packet setup
  ...
parents 770ac204 e7b8243d

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

+2 −3
Original line number Diff line number Diff line
@@ -92,13 +92,13 @@ extern int amdgpu_vm_debug; 
extern int amdgpu_sched_jobs;

extern int amdgpu_sched_hw_submission;

extern int amdgpu_powerplay;

extern int amdgpu_powercontainment;

extern int amdgpu_no_evict;

extern int amdgpu_direct_gma_size;

extern unsigned amdgpu_pcie_gen_cap;

extern unsigned amdgpu_pcie_lane_cap;

extern unsigned amdgpu_cg_mask;

extern unsigned amdgpu_pg_mask;

extern char *amdgpu_disable_cu;

extern int amdgpu_sclk_deep_sleep_en;

extern char *amdgpu_virtual_display;

extern unsigned amdgpu_pp_feature_mask;

extern int amdgpu_vram_page_split;
@@ -1633,7 +1633,6 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_display_set_vga_render_state(adev, r) (adev)->mode_info.funcs->set_vga_render_state((adev), (r))

#define amdgpu_display_vblank_get_counter(adev, crtc) (adev)->mode_info.funcs->vblank_get_counter((adev), (crtc))

#define amdgpu_display_vblank_wait(adev, crtc) (adev)->mode_info.funcs->vblank_wait((adev), (crtc))

#define amdgpu_display_is_display_hung(adev) (adev)->mode_info.funcs->is_display_hung((adev))

#define amdgpu_display_backlight_set_level(adev, e, l) (adev)->mode_info.funcs->backlight_set_level((e), (l))

#define amdgpu_display_backlight_get_level(adev, e) (adev)->mode_info.funcs->backlight_get_level((e))

#define amdgpu_display_hpd_sense(adev, h) (adev)->mode_info.funcs->hpd_sense((adev), (h))

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static bool igp_read_bios_from_vram(struct amdgpu_device *adev) 
		return false;

	}

	adev->bios = kmalloc(size, GFP_KERNEL);

	if (adev->bios == NULL) {

	if (!adev->bios) {

		iounmap(bios);

		return false;

	}

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

+16 −27
Original line number Diff line number Diff line
@@ -841,16 +841,6 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev, 
	return amdgpu_cs_sync_rings(p);

}



static int amdgpu_cs_handle_lockup(struct amdgpu_device *adev, int r)

{

	if (r == -EDEADLK) {

		r = amdgpu_gpu_reset(adev);

		if (!r)

			r = -EAGAIN;

	}

	return r;

}



static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,

			     struct amdgpu_cs_parser *parser)

{
@@ -1054,28 +1044,28 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	r = amdgpu_cs_parser_init(&parser, data);

	if (r) {

		DRM_ERROR("Failed to initialize parser !\n");

		amdgpu_cs_parser_fini(&parser, r, false);

		r = amdgpu_cs_handle_lockup(adev, r);

		return r;

		goto out;

	}



	r = amdgpu_cs_parser_bos(&parser, data);

	if (r) {

		if (r == -ENOMEM)

			DRM_ERROR("Not enough memory for command submission!\n");

	else if (r && r != -ERESTARTSYS)

		else if (r != -ERESTARTSYS)

			DRM_ERROR("Failed to process the buffer list %d!\n", r);

	else if (!r) {

		goto out;

	}



	reserved_buffers = true;

	r = amdgpu_cs_ib_fill(adev, &parser);

	}

	if (r)

		goto out;



	if (!r) {

	r = amdgpu_cs_dependencies(adev, &parser);

		if (r)

	if (r) {

		DRM_ERROR("Failed in the dependencies handling %d!\n", r);

	}



	if (r)

		goto out;

	}



	for (i = 0; i < parser.job->num_ibs; i++)

		trace_amdgpu_cs(&parser, i);
@@ -1088,7 +1078,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 


out:

	amdgpu_cs_parser_fini(&parser, r, reserved_buffers);

	r = amdgpu_cs_handle_lockup(adev, r);

	return r;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1017,8 +1017,8 @@ static void amdgpu_check_arguments(struct amdgpu_device *adev) 
		amdgpu_vm_block_size = 9;

	}



	if ((amdgpu_vram_page_split != -1 && amdgpu_vram_page_split < 16) ||

	    !amdgpu_check_pot_argument(amdgpu_vram_page_split)) {

	if (amdgpu_vram_page_split != -1 && (amdgpu_vram_page_split < 16 ||

	    !amdgpu_check_pot_argument(amdgpu_vram_page_split))) {

		dev_warn(adev->dev, "invalid VRAM page split (%d)\n",

			 amdgpu_vram_page_split);

		amdgpu_vram_page_split = 1024;

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

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ enum amdgpu_dpm_event_src { 
	AMDGPU_DPM_EVENT_SRC_DIGIAL_OR_EXTERNAL = 4

};



#define SCLK_DEEP_SLEEP_MASK 0x8



struct amdgpu_ps {

	u32 caps; /* vbios flags */

	u32 class; /* vbios flags */
@@ -317,6 +319,11 @@ struct amdgpu_dpm_funcs { 
	      (adev)->powerplay.pp_funcs->get_fan_speed_percent((adev)->powerplay.pp_handle, (s)) : \

	      (adev)->pm.funcs->get_fan_speed_percent((adev), (s)))



#define amdgpu_dpm_get_fan_speed_rpm(adev, s) \

	((adev)->pp_enabled ?						\

	      (adev)->powerplay.pp_funcs->get_fan_speed_rpm((adev)->powerplay.pp_handle, (s)) : \

	      -EINVAL)



#define amdgpu_dpm_get_sclk(adev, l) \

	((adev)->pp_enabled ?						\

	      (adev)->powerplay.pp_funcs->get_sclk((adev)->powerplay.pp_handle, (l)) : \