Commit aa1b36f2 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

This is the first radeon and amdgpu pull for drm-next. Highlights include:
- Efficiency improvements to the CS checker for pre-SI asics
- Cursor fixes ported from radeon to amdgpu
- Enable GPU scheduler by default
- Add a bunch of GPUVM debugging options
- Add support for some new atombios opcodes
- Misc cleanups and fixes

* 'drm-next-4.4' of git://people.freedesktop.org/~agd5f/linux: (42 commits)
  drm/amdgpu: fix lockup when clean pending fences
  drm/amdgpu: add timer to fence to detect scheduler lockup
  drm/amdgpu: add VM CS mapping trace point
  drm/amdgpu: add option to clear VM page tables after every submit
  drm/amdgpu: add option to stop on VM fault
  drm/amdgpu: only print meaningful VM faults
  drm/amdgpu: also trace already allocated VMIDs
  drm/amdgpu: Drop unnecessary #include <linux/vga_switcheroo.h>
  drm/radeon: Drop unnecessary #include <linux/vga_switcheroo.h>
  drm/amdgpu: clean up pageflip interrupt handling
  drm/amdgpu: rework sdma structures
  drm/amdgpu: unpin cursor BOs on suspend and pin them again on resume
  drm/amdgpu/dce8: Fold set_cursor() into show_cursor()
  drm/amdgpu/dce8: Clean up reference counting and pinning of the cursor BOs
  drm/amdgpu/dce8: Move hotspot handling out of set_cursor
  drm/amdgpu/dce8: Re-show the cursor after a modeset (v2)
  drm/amdgpu/dce8: Use cursor_set2 hook for enabling / disabling the HW cursor
  drm/amdgpu/dce11: Fold set_cursor() into show_cursor()
  drm/amdgpu/dce11: Clean up reference counting and pinning of the cursor BOs
  drm/amdgpu/dce11: Move hotspot handling out of set_cursor
  ...
parents 99a91c94 2fcef6ec

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

+21 −8
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ extern int amdgpu_bapm; 
extern int amdgpu_deep_color;

extern int amdgpu_vm_size;

extern int amdgpu_vm_block_size;

extern int amdgpu_vm_fault_stop;

extern int amdgpu_vm_debug;

extern int amdgpu_enable_scheduler;

extern int amdgpu_sched_jobs;

extern int amdgpu_sched_hw_submission;
@@ -960,6 +962,11 @@ struct amdgpu_ring { 
#define AMDGPU_PTE_FRAG_64KB	(4 << 7)

#define AMDGPU_LOG2_PAGES_PER_FRAG 4



/* How to programm VM fault handling */

#define AMDGPU_VM_FAULT_STOP_NEVER	0

#define AMDGPU_VM_FAULT_STOP_FIRST	1

#define AMDGPU_VM_FAULT_STOP_ALWAYS	2



struct amdgpu_vm_pt {

	struct amdgpu_bo		*bo;

	uint64_t			addr;
@@ -1708,7 +1715,7 @@ struct amdgpu_vce { 
/*

 * SDMA

 */

struct amdgpu_sdma {

struct amdgpu_sdma_instance {

	/* SDMA firmware */

	const struct firmware	*fw;

	uint32_t		fw_version;
@@ -1718,6 +1725,13 @@ struct amdgpu_sdma { 
	bool			burst_nop;

};



struct amdgpu_sdma {

	struct amdgpu_sdma_instance instance[AMDGPU_MAX_SDMA_INSTANCES];

	struct amdgpu_irq_src	trap_irq;

	struct amdgpu_irq_src	illegal_inst_irq;

	int 			num_instances;

};



/*

 * Firmware

 */
@@ -2064,9 +2078,7 @@ struct amdgpu_device { 
	struct amdgpu_gfx		gfx;



	/* sdma */

	struct amdgpu_sdma		sdma[AMDGPU_MAX_SDMA_INSTANCES];

	struct amdgpu_irq_src		sdma_trap_irq;

	struct amdgpu_irq_src		sdma_illegal_inst_irq;

	struct amdgpu_sdma		sdma;



	/* uvd */

	bool				has_uvd;
@@ -2203,17 +2215,18 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v) 
	ring->ring_free_dw--;

}



static inline struct amdgpu_sdma * amdgpu_get_sdma_instance(struct amdgpu_ring *ring)

static inline struct amdgpu_sdma_instance *

amdgpu_get_sdma_instance(struct amdgpu_ring *ring)

{

	struct amdgpu_device *adev = ring->adev;

	int i;



	for (i = 0; i < AMDGPU_MAX_SDMA_INSTANCES; i++)

		if (&adev->sdma[i].ring == ring)

	for (i = 0; i < adev->sdma.num_instances; i++)

		if (&adev->sdma.instance[i].ring == ring)

			break;



	if (i < AMDGPU_MAX_SDMA_INSTANCES)

		return &adev->sdma[i];

		return &adev->sdma.instance[i];

	else

		return NULL;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/power_supply.h>

#include <linux/vga_switcheroo.h>

#include <acpi/video.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

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

+2 −2
Original line number Diff line number Diff line
@@ -649,12 +649,12 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) 


	case KGD_ENGINE_SDMA1:

		hdr = (const union amdgpu_firmware_header *)

							adev->sdma[0].fw->data;

							adev->sdma.instance[0].fw->data;

		break;



	case KGD_ENGINE_SDMA2:

		hdr = (const union amdgpu_firmware_header *)

							adev->sdma[1].fw->data;

							adev->sdma.instance[1].fw->data;

		break;



	default:

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

+2 −2
Original line number Diff line number Diff line
@@ -523,12 +523,12 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) 


	case KGD_ENGINE_SDMA1:

		hdr = (const union amdgpu_firmware_header *)

							adev->sdma[0].fw->data;

							adev->sdma.instance[0].fw->data;

		break;



	case KGD_ENGINE_SDMA2:

		hdr = (const union amdgpu_firmware_header *)

							adev->sdma[1].fw->data;

							adev->sdma.instance[1].fw->data;

		break;



	default:

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

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static bool amdgpu_atpx_detect(void) 


	if (has_atpx && vga_count == 2) {

		acpi_get_name(amdgpu_atpx_priv.atpx.handle, ACPI_FULL_PATHNAME, &buffer);

		printk(KERN_INFO "VGA switcheroo: detected switching method %s handle\n",

		printk(KERN_INFO "vga_switcheroo: detected switching method %s handle\n",

		       acpi_method_name);

		amdgpu_atpx_priv.atpx_detected = true;

		return true;

CRA Git | Maintained and supported by SUSTech CRA and CCSE