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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 Jan 2015 13:22:49 +1100

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d
("drm/amd: Fixing typos in kfd<->kgd interface") from Linus'  tree and
commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions")
from the drm tree.

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

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc drivers/gpu/drm/radeon/radeon_kfd.c
index 8bf87f1203cc,cae11eefecf0..000000000000
--- a/drivers/gpu/drm/radeon/radeon_kfd.c
+++ b/drivers/gpu/drm/radeon/radeon_kfd.c
@@@ -71,8 -70,8 +70,8 @@@ static int kgd_init_pipeline(struct kgd
  
  static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id,
  			uint32_t queue_id, uint32_t __user *wptr);
- 
+ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd);
 -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address,
 +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address,
  				uint32_t pipe_id, uint32_t queue_id);
  
  static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type,
@@@ -92,8 -92,11 +92,11 @@@ static const struct kfd2kgd_calls kfd2k
  	.init_memory = kgd_init_memory,
  	.init_pipeline = kgd_init_pipeline,
  	.hqd_load = kgd_hqd_load,
+ 	.hqd_sdma_load = kgd_hqd_sdma_load,
 -	.hqd_is_occupies = kgd_hqd_is_occupies,
 +	.hqd_is_occupied = kgd_hqd_is_occupied,
+ 	.hqd_sdma_is_occupied = kgd_hqd_sdma_is_occupied,
  	.hqd_destroy = kgd_hqd_destroy,
+ 	.hqd_sdma_destroy = kgd_hqd_sdma_destroy,
  	.get_fw_version = get_fw_version
  };
  
@@@ -533,7 -528,46 +544,46 @@@ static int kgd_hqd_load(struct kgd_dev 
  	return 0;
  }
  
+ static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd)
+ {
+ 	struct cik_sdma_rlc_registers *m;
+ 	uint32_t sdma_base_addr;
+ 
+ 	m = get_sdma_mqd(mqd);
+ 	sdma_base_addr = get_sdma_base_addr(m);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_VIRTUAL_ADDR,
+ 			m->sdma_rlc_virtual_addr);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_RB_BASE,
+ 			m->sdma_rlc_rb_base);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_RB_BASE_HI,
+ 			m->sdma_rlc_rb_base_hi);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_RB_RPTR_ADDR_LO,
+ 			m->sdma_rlc_rb_rptr_addr_lo);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_RB_RPTR_ADDR_HI,
+ 			m->sdma_rlc_rb_rptr_addr_hi);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_DOORBELL,
+ 			m->sdma_rlc_doorbell);
+ 
+ 	write_register(kgd,
+ 			sdma_base_addr + SDMA0_RLC0_RB_CNTL,
+ 			m->sdma_rlc_rb_cntl);
+ 
+ 	return 0;
+ }
+ 
 -static bool kgd_hqd_is_occupies(struct kgd_dev *kgd, uint64_t queue_address,
 +static bool kgd_hqd_is_occupied(struct kgd_dev *kgd, uint64_t queue_address,
  				uint32_t pipe_id, uint32_t queue_id)
  {
  	uint32_t act;