* [renesas-drivers:master 152/165] drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:992:1: error: version control conflict marker in file
@ 2021-06-08 15:45 kernel test robot
0 siblings, 0 replies; only message in thread
From: kernel test robot @ 2021-06-08 15:45 UTC (permalink / raw)
To: Christian König; +Cc: kbuild-all, linux-renesas-soc, Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 34497 bytes --]
tree: https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git master
head: afd2bd149ec124722b609dcf91e1acbb9eec6593
commit: 067856b548f5d4a61d28ff88b97ac08150153e81 [152/165] Merge remote-tracking branch 'drm-misc/for-linux-next' into renesas-drivers
config: csky-randconfig-r014-20210608 (attached as .config)
compiler: csky-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=067856b548f5d4a61d28ff88b97ac08150153e81
git remote add renesas-drivers https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
git fetch --no-tags renesas-drivers master
git checkout 067856b548f5d4a61d28ff88b97ac08150153e81
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=csky
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_alloc_gart':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:992:1: error: version control conflict marker in file
992 | <<<<<<< HEAD
| ^~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:994:28: error: 'struct ttm_buffer_object' has no member named 'mem'
994 | ttm_resource_free(bo, &bo->mem);
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:995:5: error: 'struct ttm_buffer_object' has no member named 'mem'
995 | bo->mem = tmp;
| ^~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:996:1: error: version control conflict marker in file
996 | ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
| ^~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:996:10: warning: missing terminating ' character
996 | ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
| ^
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:996:10: error: missing terminating ' character
996 | ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1003:1: error: version control conflict marker in file
1003 | >>>>>>> drm-misc/for-linux-next
| ^~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:959:24: warning: unused variable 'gtt' [-Wunused-variable]
959 | struct amdgpu_ttm_tt *gtt = (void *)bo->ttm;
| ^~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_bo_eviction_valuable':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1369:1: error: version control conflict marker in file
1369 | <<<<<<< HEAD
| ^~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1510:13: error: invalid storage class for function 'amdgpu_ttm_fw_reserve_vram_fini'
1510 | static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1510:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
1510 | static void amdgpu_ttm_fw_reserve_vram_fini(struct amdgpu_device *adev)
| ^~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1523:12: error: invalid storage class for function 'amdgpu_ttm_fw_reserve_vram_init'
1523 | static int amdgpu_ttm_fw_reserve_vram_init(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1553:12: error: invalid storage class for function 'amdgpu_ttm_training_reserve_vram_fini'
1553 | static int amdgpu_ttm_training_reserve_vram_fini(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1564:13: error: invalid storage class for function 'amdgpu_ttm_training_data_block_init'
1564 | static void amdgpu_ttm_training_data_block_init(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1587:12: error: invalid storage class for function 'amdgpu_ttm_reserve_tmr'
1587 | static int amdgpu_ttm_reserve_tmr(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_init':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1662:41: error: 'amdgpu_bo_driver' undeclared (first use in this function); did you mean 'amdgpu_bo_move'?
1662 | r = ttm_device_init(&adev->mman.bdev, &amdgpu_bo_driver, adev->dev,
| ^~~~~~~~~~~~~~~~
| amdgpu_bo_move
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1662:41: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1961:1: error: version control conflict marker in file
1961 | <<<<<<< HEAD
| ^~~~~~~
In file included from drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:38:
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2096:23: error: invalid storage class for function 'amdgpu_mm_tt_table_open'
2096 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_tt_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:173:12: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_mm_tt_table_open':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2096:23: error: 'amdgpu_mm_tt_table_show' undeclared (first use in this function); did you mean 'amdgpu_mm_tt_table_open'?
2096 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_tt_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:175:27: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
175 | return single_open(file, __name ## _show, inode->i_private); \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
>> include/linux/seq_file.h:173:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2096:1: note: in expansion of macro 'DEFINE_SHOW_ATTRIBUTE'
2096 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_tt_table);
| ^~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2096:23: error: initializer element is not constant
2096 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_tt_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2096:23: note: (near initialization for 'amdgpu_mm_tt_table_fops.open')
2096 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_tt_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2097:23: error: invalid storage class for function 'amdgpu_mm_gds_table_open'
2097 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gds_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:173:12: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_mm_gds_table_open':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2097:23: error: 'amdgpu_mm_gds_table_show' undeclared (first use in this function); did you mean 'amdgpu_mm_gds_table_open'?
2097 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gds_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:175:27: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
175 | return single_open(file, __name ## _show, inode->i_private); \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2097:23: error: initializer element is not constant
2097 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gds_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2097:23: note: (near initialization for 'amdgpu_mm_gds_table_fops.open')
2097 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gds_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2098:23: error: invalid storage class for function 'amdgpu_mm_gws_table_open'
2098 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gws_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:173:12: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_mm_gws_table_open':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2098:23: error: 'amdgpu_mm_gws_table_show' undeclared (first use in this function); did you mean 'amdgpu_mm_gws_table_open'?
2098 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gws_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:175:27: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
175 | return single_open(file, __name ## _show, inode->i_private); \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2098:23: error: initializer element is not constant
2098 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gws_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2098:23: note: (near initialization for 'amdgpu_mm_gws_table_fops.open')
2098 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_gws_table);
| ^~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2099:23: error: invalid storage class for function 'amdgpu_mm_oa_table_open'
2099 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_oa_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:173:12: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_mm_oa_table_open':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2099:23: error: 'amdgpu_mm_oa_table_show' undeclared (first use in this function); did you mean 'amdgpu_mm_oa_table_open'?
2099 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_oa_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:175:27: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
175 | return single_open(file, __name ## _show, inode->i_private); \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2099:23: error: initializer element is not constant
2099 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_oa_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2099:23: note: (near initialization for 'amdgpu_mm_oa_table_fops.open')
2099 | DEFINE_SHOW_ATTRIBUTE(amdgpu_mm_oa_table);
| ^~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2100:23: error: invalid storage class for function 'amdgpu_ttm_page_pool_open'
2100 | DEFINE_SHOW_ATTRIBUTE(amdgpu_ttm_page_pool);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:173:12: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
173 | static int __name ## _open(struct inode *inode, struct file *file) \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_page_pool_open':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2100:23: error: 'amdgpu_ttm_page_pool_show' undeclared (first use in this function); did you mean 'amdgpu_ttm_page_pool_open'?
2100 | DEFINE_SHOW_ATTRIBUTE(amdgpu_ttm_page_pool);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:175:27: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
175 | return single_open(file, __name ## _show, inode->i_private); \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2100:23: error: initializer element is not constant
2100 | DEFINE_SHOW_ATTRIBUTE(amdgpu_ttm_page_pool);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2100:23: note: (near initialization for 'amdgpu_ttm_page_pool_fops.open')
2100 | DEFINE_SHOW_ATTRIBUTE(amdgpu_ttm_page_pool);
| ^~~~~~~~~~~~~~~~~~~~
include/linux/seq_file.h:180:11: note: in definition of macro 'DEFINE_SHOW_ATTRIBUTE'
180 | .open = __name ## _open, \
| ^~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2107:16: error: invalid storage class for function 'amdgpu_ttm_vram_read'
2107 | static ssize_t amdgpu_ttm_vram_read(struct file *f, char __user *buf,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2142:16: error: invalid storage class for function 'amdgpu_ttm_vram_write'
2142 | static ssize_t amdgpu_ttm_vram_write(struct file *f, const char __user *buf,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2183:10: error: initializer element is not constant
2183 | .read = amdgpu_ttm_vram_read,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2183:10: note: (near initialization for 'amdgpu_ttm_vram_fops.read')
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2184:11: error: initializer element is not constant
2184 | .write = amdgpu_ttm_vram_write,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2184:11: note: (near initialization for 'amdgpu_ttm_vram_fops.write')
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2195:16: error: invalid storage class for function 'amdgpu_iomem_read'
2195 | static ssize_t amdgpu_iomem_read(struct file *f, char __user *buf,
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2251:16: error: invalid storage class for function 'amdgpu_iomem_write'
2251 | static ssize_t amdgpu_iomem_write(struct file *f, const char __user *buf,
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2297:10: error: initializer element is not constant
2297 | .read = amdgpu_iomem_read,
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2297:10: note: (near initialization for 'amdgpu_ttm_iomem_fops.read')
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2298:11: error: initializer element is not constant
2298 | .write = amdgpu_iomem_write,
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2298:11: note: (near initialization for 'amdgpu_ttm_iomem_fops.write')
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_ttm_debugfs_init':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2315:9: error: 'amdgpu_mm_vram_table_fops' undeclared (first use in this function); did you mean 'amdgpu_mm_oa_table_fops'?
2315 | &amdgpu_mm_vram_table_fops);
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| amdgpu_mm_oa_table_fops
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function 'amdgpu_fill_buffer':
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:2327:1: error: expected declaration or statement at end of input
2327 | }
| ^
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1954:6: warning: unused variable 'r' [-Wunused-variable]
1954 | int r;
| ^
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1953:21: warning: unused variable 'job' [-Wunused-variable]
1953 | struct amdgpu_job *job;
| ^~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1951:11: warning: unused variable 'num_bytes' [-Wunused-variable]
1951 | uint64_t num_bytes;
| ^~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1950:26: warning: unused variable 'num_dw' [-Wunused-variable]
1950 | unsigned int num_loops, num_dw;
| ^~~~~~
--
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_move_to_lru_tail':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:663:1: error: version control conflict marker in file
663 | <<<<<<< HEAD
| ^~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:666:10: warning: missing terminating ' character
666 | ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
| ^
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:666:10: error: missing terminating ' character
666 | ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:656:21: warning: unused variable 'shadow' [-Wunused-variable]
656 | struct amdgpu_bo *shadow = amdgpu_bo_shadowed(bo);
| ^~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:691:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
691 | int amdgpu_vm_validate_pt_bos(struct amdgpu_device *adev, struct amdgpu_vm *vm,
| ^~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:756:12: error: invalid storage class for function 'amdgpu_vm_clear_bo'
756 | static int amdgpu_vm_clear_bo(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:878:12: error: invalid storage class for function 'amdgpu_vm_pt_create'
878 | static int amdgpu_vm_pt_create(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:965:12: error: invalid storage class for function 'amdgpu_vm_alloc_pts'
965 | static int amdgpu_vm_alloc_pts(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1016:13: error: invalid storage class for function 'amdgpu_vm_free_table'
1016 | static void amdgpu_vm_free_table(struct amdgpu_vm_pt *entry)
| ^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1039:13: error: invalid storage class for function 'amdgpu_vm_free_pts'
1039 | static void amdgpu_vm_free_pts(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1310:12: error: invalid storage class for function 'amdgpu_vm_update_pde'
1310 | static int amdgpu_vm_update_pde(struct amdgpu_vm_update_params *params,
| ^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1337:13: error: invalid storage class for function 'amdgpu_vm_invalidate_pds'
1337 | static void amdgpu_vm_invalidate_pds(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1405:13: error: invalid storage class for function 'amdgpu_vm_update_flags'
1405 | static void amdgpu_vm_update_flags(struct amdgpu_vm_update_params *params,
| ^~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1440:13: error: invalid storage class for function 'amdgpu_vm_fragment'
1440 | static void amdgpu_vm_fragment(struct amdgpu_vm_update_params *params,
| ^~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1503:12: error: invalid storage class for function 'amdgpu_vm_update_ptes'
1503 | static int amdgpu_vm_update_ptes(struct amdgpu_vm_update_params *params,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_bo_update':
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1870:1: error: version control conflict marker in file
1870 | <<<<<<< HEAD
| ^~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1874:1: error: version control conflict marker in file
1874 | =======
| ^~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1877:1: error: version control conflict marker in file
1877 | >>>>>>> drm-misc/for-linux-next
| ^~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c: In function 'amdgpu_vm_move_to_lru_tail':
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1963:13: error: invalid storage class for function 'amdgpu_vm_update_prt_state'
1963 | static void amdgpu_vm_update_prt_state(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1979:13: error: invalid storage class for function 'amdgpu_vm_prt_get'
1979 | static void amdgpu_vm_prt_get(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1993:13: error: invalid storage class for function 'amdgpu_vm_prt_put'
1993 | static void amdgpu_vm_prt_put(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2005:13: error: invalid storage class for function 'amdgpu_vm_prt_cb'
2005 | static void amdgpu_vm_prt_cb(struct dma_fence *fence, struct dma_fence_cb *_cb)
| ^~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2019:13: error: invalid storage class for function 'amdgpu_vm_add_prt_cb'
2019 | static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~
>> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2052:13: error: invalid storage class for function 'amdgpu_vm_free_mapping'
2052 | static void amdgpu_vm_free_mapping(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2070:13: error: invalid storage class for function 'amdgpu_vm_prt_fini'
2070 | static void amdgpu_vm_prt_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2263:13: error: invalid storage class for function 'amdgpu_vm_bo_insert_map'
2263 | static void amdgpu_vm_bo_insert_map(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2759:17: error: invalid storage class for function 'amdgpu_vm_get_block_size'
2759 | static uint32_t amdgpu_vm_get_block_size(uint64_t vm_size)
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3016:12: error: invalid storage class for function 'amdgpu_vm_check_clean_reserved'
3016 | static int amdgpu_vm_check_clean_reserved(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3588:1: error: expected declaration or statement at end of input
3588 | }
| ^
At top level:
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3504:6: warning: 'amdgpu_debugfs_vm_bo_info' defined but not used [-Wunused-function]
3504 | void amdgpu_debugfs_vm_bo_info(struct amdgpu_vm *vm, struct seq_file *m)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3406:6: warning: 'amdgpu_vm_handle_fault' defined but not used [-Wunused-function]
3406 | bool amdgpu_vm_handle_fault(struct amdgpu_device *adev, u32 pasid,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3382:6: warning: 'amdgpu_vm_set_task_info' defined but not used [-Wunused-function]
3382 | void amdgpu_vm_set_task_info(struct amdgpu_vm *vm)
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3362:6: warning: 'amdgpu_vm_get_task_info' defined but not used [-Wunused-function]
3362 | void amdgpu_vm_get_task_info(struct amdgpu_device *adev, u32 pasid,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3314:5: warning: 'amdgpu_vm_ioctl' defined but not used [-Wunused-function]
3314 | int amdgpu_vm_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
| ^~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3296:6: warning: 'amdgpu_vm_manager_fini' defined but not used [-Wunused-function]
3296 | void amdgpu_vm_manager_fini(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3249:6: warning: 'amdgpu_vm_manager_init' defined but not used [-Wunused-function]
3249 | void amdgpu_vm_manager_init(struct amdgpu_device *adev)
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3184:6: warning: 'amdgpu_vm_fini' defined but not used [-Wunused-function]
3184 | void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
| ^~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3162:6: warning: 'amdgpu_vm_release_compute' defined but not used [-Wunused-function]
3162 | void amdgpu_vm_release_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm)
| ^~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:3055:5: warning: 'amdgpu_vm_make_compute' defined but not used [-Wunused-function]
3055 | int amdgpu_vm_make_compute(struct amdgpu_device *adev, struct amdgpu_vm *vm,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2894:5: warning: 'amdgpu_vm_init' defined but not used [-Wunused-function]
2894 | int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, u32 pasid)
| ^~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2782:6: warning: 'amdgpu_vm_adjust_size' defined but not used [-Wunused-function]
2782 | void amdgpu_vm_adjust_size(struct amdgpu_device *adev, uint32_t min_vm_size,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2721:6: warning: 'amdgpu_vm_bo_invalidate' defined but not used [-Wunused-function]
2721 | void amdgpu_vm_bo_invalidate(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2685:6: warning: 'amdgpu_vm_evictable' defined but not used [-Wunused-function]
2685 | bool amdgpu_vm_evictable(struct amdgpu_bo *bo)
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2630:6: warning: 'amdgpu_vm_bo_rmv' defined but not used [-Wunused-function]
2630 | void amdgpu_vm_bo_rmv(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2598:6: warning: 'amdgpu_vm_bo_trace_cs' defined but not used [-Wunused-function]
2598 | void amdgpu_vm_bo_trace_cs(struct amdgpu_vm *vm, struct ww_acquire_ctx *ticket)
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2584:30: warning: 'amdgpu_vm_bo_lookup_mapping' defined but not used [-Wunused-function]
2584 | struct amdgpu_bo_va_mapping *amdgpu_vm_bo_lookup_mapping(struct amdgpu_vm *vm,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2481:5: warning: 'amdgpu_vm_bo_clear_mappings' defined but not used [-Wunused-function]
2481 | int amdgpu_vm_bo_clear_mappings(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2427:5: warning: 'amdgpu_vm_bo_unmap' defined but not used [-Wunused-function]
2427 | int amdgpu_vm_bo_unmap(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2367:5: warning: 'amdgpu_vm_bo_replace_map' defined but not used [-Wunused-function]
2367 | int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2301:5: warning: 'amdgpu_vm_bo_map' defined but not used [-Wunused-function]
2301 | int amdgpu_vm_bo_map(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2225:22: warning: 'amdgpu_vm_bo_add' defined but not used [-Wunused-function]
2225 | struct amdgpu_bo_va *amdgpu_vm_bo_add(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2168:5: warning: 'amdgpu_vm_handle_moved' defined but not used [-Wunused-function]
2168 | int amdgpu_vm_handle_moved(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:2114:5: warning: 'amdgpu_vm_clear_freed' defined but not used [-Wunused-function]
2114 | int amdgpu_vm_clear_freed(struct amdgpu_device *adev,
| ^~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1785:6: warning: 'amdgpu_vm_get_memory' defined but not used [-Wunused-function]
1785 | void amdgpu_vm_get_memory(struct amdgpu_vm *vm, uint64_t *vram_mem,
| ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1286:10: warning: 'amdgpu_vm_map_gart' defined but not used [-Wunused-function]
1286 | uint64_t amdgpu_vm_map_gart(const dma_addr_t *pages_addr, uint64_t addr)
| ^~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1260:22: warning: 'amdgpu_vm_bo_find' defined but not used [-Wunused-function]
1260 | struct amdgpu_bo_va *amdgpu_vm_bo_find(struct amdgpu_vm *vm,
| ^~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c:1138:5: warning: 'amdgpu_vm_flush' defined but not used [-Wunused-function]
..
Kconfig warnings: (for reference only)
WARNING: unmet direct dependencies detected for LOCKDEP
Depends on DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT && (FRAME_POINTER || MIPS || PPC || S390 || MICROBLAZE || ARM || ARC || X86)
Selected by
- LOCK_STAT && DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT
- DEBUG_LOCK_ALLOC && DEBUG_KERNEL && LOCK_DEBUGGING_SUPPORT
vim +992 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
946
947 /*
948 * amdgpu_ttm_alloc_gart - Make sure buffer object is accessible either
949 * through AGP or GART aperture.
950 *
951 * If bo is accessible through AGP aperture, then use AGP aperture
952 * to access bo; otherwise allocate logical space in GART aperture
953 * and map bo to GART aperture.
954 */
955 int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo)
956 {
957 struct amdgpu_device *adev = amdgpu_ttm_adev(bo->bdev);
958 struct ttm_operation_ctx ctx = { false, false };
959 struct amdgpu_ttm_tt *gtt = (void *)bo->ttm;
960 struct ttm_placement placement;
961 struct ttm_place placements;
962 struct ttm_resource *tmp;
963 uint64_t addr, flags;
964 int r;
965
966 if (bo->resource->start != AMDGPU_BO_INVALID_OFFSET)
967 return 0;
968
969 addr = amdgpu_gmc_agp_addr(bo);
970 if (addr != AMDGPU_BO_INVALID_OFFSET) {
971 bo->resource->start = addr >> PAGE_SHIFT;
972 return 0;
973 }
974
975 /* allocate GART space */
976 placement.num_placement = 1;
977 placement.placement = &placements;
978 placement.num_busy_placement = 1;
979 placement.busy_placement = &placements;
980 placements.fpfn = 0;
981 placements.lpfn = adev->gmc.gart_size >> PAGE_SHIFT;
982 placements.mem_type = TTM_PL_TT;
983 placements.flags = bo->resource->placement;
984
985 r = ttm_bo_mem_space(bo, &placement, &tmp, &ctx);
986 if (unlikely(r))
987 return r;
988
989 /* compute PTE flags for this buffer object */
990 flags = amdgpu_ttm_tt_pte_flags(adev, bo->ttm, tmp);
991
> 992 <<<<<<< HEAD
993 amdgpu_gart_invalidate_tlb(adev);
> 994 ttm_resource_free(bo, &bo->mem);
995 bo->mem = tmp;
> 996 ======= I'M SOOOOOO TIRED OF THESE CONFLICTS BETWEEN DRM/DRM-NEXT AND DRM-MISC/FOR-LINUX-NEXT
997 /* Bind pages */
998 gtt->offset = (u64)tmp->start << PAGE_SHIFT;
999 r = amdgpu_ttm_gart_bind(adev, bo, flags);
1000 if (unlikely(r)) {
1001 ttm_resource_free(bo, &tmp);
1002 return r;
1003 >>>>>>> drm-misc/for-linux-next
1004 }
1005
1006 ttm_resource_free(bo, &bo->resource);
1007 ttm_bo_assign_mem(bo, tmp);
1008
1009 return 0;
1010 }
1011
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 33410 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-08 15:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 15:45 [renesas-drivers:master 152/165] drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:992:1: error: version control conflict marker in file kernel test robot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).