diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2980-fixes-the-compilation-issues-v5.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2980-fixes-the-compilation-issues-v5.patch | 168 |
1 files changed, 168 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2980-fixes-the-compilation-issues-v5.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2980-fixes-the-compilation-issues-v5.patch new file mode 100644 index 00000000..ee8c02ab --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/2980-fixes-the-compilation-issues-v5.patch @@ -0,0 +1,168 @@ +From b563b06a8dcde1efa790130a338ec354c4374936 Mon Sep 17 00:00:00 2001 +From: Kalyan Alle <kalyan.alle@amd.com> +Date: Thu, 26 Apr 2018 14:29:00 +0530 +Subject: [PATCH 2980/4131] fixes the compilation issues v5 + +This patch fixes the compilation issues while porting +from branch: amd-18.10 , repo:brahma/ec/linux + +Signed-off-by: kalyan alle <kalyan.alle@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 28 ++++++++++++++-------------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- + 2 files changed, 15 insertions(+), 16 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +index 07ae10f..e0838b2 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +@@ -88,7 +88,7 @@ void amdgpu_debugfs_cleanup(struct drm_minor *minor) + static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + bool pm_pg_lock, use_bank; +@@ -164,7 +164,7 @@ static ssize_t amdgpu_debugfs_regs_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + bool pm_pg_lock, use_bank; +@@ -238,7 +238,7 @@ static ssize_t amdgpu_debugfs_regs_write(struct file *f, const char __user *buf, + static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -265,7 +265,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -293,7 +293,7 @@ static ssize_t amdgpu_debugfs_regs_pcie_write(struct file *f, const char __user + static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -320,7 +320,7 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -348,7 +348,7 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user + static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -375,7 +375,7 @@ static ssize_t amdgpu_debugfs_regs_smc_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + +@@ -403,7 +403,7 @@ static ssize_t amdgpu_debugfs_regs_smc_write(struct file *f, const char __user * + static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + ssize_t result = 0; + int r; + uint32_t *config, no_regs = 0; +@@ -479,7 +479,7 @@ static ssize_t amdgpu_debugfs_gca_config_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + int idx, x, outsize, r, valuesize; + uint32_t values[16]; + +@@ -518,7 +518,7 @@ static ssize_t amdgpu_debugfs_sensor_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + int r, x; + ssize_t result=0; + uint32_t offset, se, sh, cu, wave, simd, data[32]; +@@ -568,7 +568,7 @@ static ssize_t amdgpu_debugfs_wave_read(struct file *f, char __user *buf, + static ssize_t amdgpu_debugfs_gpr_read(struct file *f, char __user *buf, + size_t size, loff_t *pos) + { +- struct amdgpu_device *adev = (struct amdgpu_device *)kcl_file_private(f); ++ struct amdgpu_device *adev = file_inode(f)->i_private; + int r; + ssize_t result = 0; + uint32_t offset, se, sh, cu, wave, simd, thread, bank, *data; +@@ -746,7 +746,7 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data) + + if (!ring || !ring->sched.thread) + continue; +- kcl_kthread_park(ring->sched.thread); ++ kthread_park(ring->sched.thread); + } + + seq_printf(m, "run ib test:\n"); +@@ -762,7 +762,7 @@ static int amdgpu_debugfs_test_ib(struct seq_file *m, void *data) + + if (!ring || !ring->sched.thread) + continue; +- kcl_kthread_unpark(ring->sched.thread); ++ kthread_unpark(ring->sched.thread); + } + + return 0; +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +index d05ba9e..97823a3 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +@@ -1532,7 +1532,6 @@ static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev) + */ + static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev) + { +- struct ttm_operation_ctx ctx = { false, false }; + int r = 0; + int i; + u64 vram_size = adev->mc.visible_vram_size; +@@ -1570,7 +1569,7 @@ static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev) + + ttm_bo_mem_put(&bo->tbo, &bo->tbo.mem); + r = ttm_bo_mem_space(&bo->tbo, &bo->placement, +- &bo->tbo.mem, &ctx); ++ &bo->tbo.mem, false, false); + if (r) + goto error_pin; + +-- +2.7.4 + |