linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/amd/amdkfd/kfd_priv.h between commit 6ee0ad2a7f27
("drm/amdkfd: Drop interrupt SW ring buffer") from Linus' tree and
commit 36b5c08f099a ("drm/amdkfd: Add gtt sa related data to kfd_dev
struct") from the drm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index b3dc13c83169,a79c21781d3b..000000000000
--- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -135,6 -143,21 +143,14 @@@ struct kfd_dev 
  
  	struct kgd2kfd_shared_resources shared_resources;
  
+ 	void *gtt_mem;
+ 	uint64_t gtt_start_gpu_addr;
+ 	void *gtt_start_cpu_ptr;
+ 	void *gtt_sa_bitmap;
+ 	struct mutex gtt_sa_lock;
+ 	unsigned int gtt_sa_chunk_size;
+ 	unsigned int gtt_sa_num_of_chunks;
+ 
 -	void *interrupt_ring;
 -	size_t interrupt_ring_size;
 -	atomic_t interrupt_ring_rptr;
 -	atomic_t interrupt_ring_wptr;
 -	struct work_struct interrupt_work;
 -	spinlock_t interrupt_lock;
 -
  	/* QCM Device instance */
  	struct device_queue_manager *dqm;

Attachment: pgpzcLilHhZWb.pgp
Description: OpenPGP digital signature