.. | .. |
---|
621 | 621 | #ifdef CONFIG_ROCKCHIP_RGA_PROC_FS |
---|
622 | 622 | static int rga_procfs_open(struct inode *inode, struct file *file) |
---|
623 | 623 | { |
---|
| 624 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) |
---|
| 625 | + struct rga_debugger_node *node = pde_data(inode); |
---|
| 626 | +#else |
---|
624 | 627 | struct rga_debugger_node *node = PDE_DATA(inode); |
---|
| 628 | +#endif |
---|
625 | 629 | |
---|
626 | 630 | return single_open(file, node->info_ent->show, node); |
---|
627 | 631 | } |
---|
.. | .. |
---|
836 | 840 | struct file *file; |
---|
837 | 841 | size_t size = 0; |
---|
838 | 842 | loff_t pos = 0; |
---|
| 843 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) |
---|
| 844 | + int ret; |
---|
| 845 | + struct iosys_map map; |
---|
| 846 | +#endif |
---|
839 | 847 | void *kvaddr = NULL; |
---|
840 | 848 | void *kvaddr_origin = NULL; |
---|
841 | 849 | |
---|
.. | .. |
---|
848 | 856 | return -EINVAL; |
---|
849 | 857 | } |
---|
850 | 858 | |
---|
| 859 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) |
---|
| 860 | + ret = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf, &map); |
---|
| 861 | + kvaddr = ret ? NULL : map.vaddr; |
---|
| 862 | +#else |
---|
851 | 863 | kvaddr = dma_buf_vmap(dump_buffer->dma_buffer->dma_buf); |
---|
| 864 | +#endif |
---|
852 | 865 | if (!kvaddr) { |
---|
853 | 866 | pr_err("can't vmap the dma buffer!\n"); |
---|
854 | 867 | return -EINVAL; |
---|
.. | .. |
---|
918 | 931 | switch (dump_buffer->type) { |
---|
919 | 932 | case RGA_DMA_BUFFER: |
---|
920 | 933 | case RGA_DMA_BUFFER_PTR: |
---|
| 934 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) |
---|
| 935 | + dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, &map); |
---|
| 936 | +#else |
---|
921 | 937 | dma_buf_vunmap(dump_buffer->dma_buffer->dma_buf, kvaddr_origin); |
---|
| 938 | +#endif |
---|
922 | 939 | break; |
---|
923 | 940 | case RGA_VIRTUAL_ADDRESS: |
---|
924 | 941 | vunmap(kvaddr_origin); |
---|