diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1356-remove-radeon-driver-compilation-error.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1356-remove-radeon-driver-compilation-error.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1356-remove-radeon-driver-compilation-error.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1356-remove-radeon-driver-compilation-error.patch new file mode 100644 index 00000000..0e526230 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/1356-remove-radeon-driver-compilation-error.patch @@ -0,0 +1,77 @@ +From 4e555b4521f10b912dc558541a7c7dafa32c2d84 Mon Sep 17 00:00:00 2001 +From: root <root@yocto-build.amd.com> +Date: Thu, 29 Mar 2018 19:36:47 +0530 +Subject: [PATCH 1356/4131] remove radeon driver compilation error + +Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com> +--- + drivers/gpu/drm/radeon/radeon_kfd.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + mode change 100644 => 100755 drivers/gpu/drm/radeon/radeon_kfd.c + +diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c +old mode 100644 +new mode 100755 +index a2ab6dc..c7d2e7a +--- a/drivers/gpu/drm/radeon/radeon_kfd.c ++++ b/drivers/gpu/drm/radeon/radeon_kfd.c +@@ -75,12 +75,15 @@ static int kgd_init_pipeline(struct kgd_dev *kgd, uint32_t pipe_id, + uint32_t hpd_size, uint64_t hpd_gpu_addr); + static int kgd_init_interrupts(struct kgd_dev *kgd, uint32_t pipe_id); + 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); ++ uint32_t queue_id, uint32_t __user *wptr, ++ uint32_t wptr_shift, uint32_t wptr_mask, ++ struct mm_struct *mm); ++static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, ++ uint32_t __user *wptr, struct mm_struct *mm); + 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, ++static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, uint32_t reset_type, + unsigned int timeout, uint32_t pipe_id, + uint32_t queue_id); + static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd); +@@ -107,7 +110,6 @@ static void write_vmid_invalidate_request(struct kgd_dev *kgd, uint8_t vmid); + static const struct kfd2kgd_calls kfd2kgd = { + .init_gtt_mem_allocation = alloc_gtt_mem, + .free_gtt_mem = free_gtt_mem, +- .get_vmem_size = get_vmem_size, + .get_gpu_clock_counter = get_gpu_clock_counter, + .get_max_engine_clock_in_mhz = get_max_engine_clock_in_mhz, + .program_sh_mem_settings = kgd_program_sh_mem_settings, +@@ -482,7 +484,9 @@ static inline struct cik_sdma_rlc_registers *get_sdma_mqd(void *mqd) + } + + static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, +- uint32_t queue_id, uint32_t __user *wptr) ++ uint32_t queue_id, uint32_t __user *wptr, ++ uint32_t wptr_shift, uint32_t wptr_mask, ++ struct mm_struct *mm) + { + uint32_t wptr_shadow, is_wptr_shadow_valid; + struct cik_mqd *m; +@@ -558,7 +562,8 @@ static int kgd_hqd_load(struct kgd_dev *kgd, void *mqd, uint32_t pipe_id, + return 0; + } + +-static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd) ++static int kgd_hqd_sdma_load(struct kgd_dev *kgd, void *mqd, ++ uint32_t __user *wptr, struct mm_struct *mm) + { + struct cik_sdma_rlc_registers *m; + uint32_t sdma_base_addr; +@@ -636,7 +641,7 @@ static bool kgd_hqd_sdma_is_occupied(struct kgd_dev *kgd, void *mqd) + return false; + } + +-static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, ++static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, uint32_t reset_type, + unsigned int timeout, uint32_t pipe_id, + uint32_t queue_id) + { +-- +2.7.4 + |