This patch adds PCI driver wrapper on the top of what drm/etnaviv already have, with the expectation that to keep component framework untoughed and to preserve code sharing. drm/etnaviv use the component framework to bind multiple GPU cores to a virtual master platform device, the virtual master is create during driver load time. For the PCI(e) device who integrate vivante GPU ip, the process to going to be reverse. Create virtual platform device as a representation for the vivante GPU ip core attached on the real PCIe master. The master already there by the time the driver is loaded, what we need to do is to devide the big MMIO resource and assign it tp the child. All the virtual childs are bind to the master with component framework. v6: * Fix build issue on system without CONFIG_PCI enabled v7: * Add a separate patch for the platform driver rearrangement (Bjorn) * Switch to runtime check if the GPU is dma coherent or not (Lucas) * Add ETNAVIV_PARAM_GPU_COHERENT to allow userspace to query (Lucas) * Remove etnaviv_gpu.no_clk member (Lucas) * Various Typos and coding style fixed (Bjorn) v8: * Fix typos and remove unnecessary header included (Bjorn). * Add a dedicated function to create the virtual master platform device. v9: * Use PCI_VDEVICE() macro (Bjorn) * Add trivial stubs for the PCI driver (Bjorn) * Remove a redundant dev_err() usage (Bjorn) * Clean up etnaviv_pdev_probe() with etnaviv_of_first_available_node() v10: * Add one more cleanup patch * Resolve the conflict with a patch from Rob * Make the dummy PCI stub inlined * Print only if the platform is dma-coherrent V11: * Drop unnecessary changes (Lucas) * Tweak according to other reviews of v10. V12: * Create a virtual platform device for the subcomponent GPU cores * Bind all subordinate GPU cores to the real PCI master via component. V13: * Drop the non-component code path (side-by-side implement), always use the component framework to bind subcomponent GPU core. Even though this is only one core. * Defer the irq handler register. * Rebase and improve the commit message The whole patch series have been tested on X86-64 and LoongArch platform. Tested with JD9230P GPU, only brief product overview is available[1]. [1] http://www.goldendisk.cn/index.php?s=index/show/index&id=273 $ dmesg | grep etnaviv: etnaviv 0000:05:00.0: JingJia Micro JD9230P has 2 GPU cores etnaviv 0000:05:00.0: bound etnaviv-gpu,3d.0 (ops gpu_ops [etnaviv]) etnaviv 0000:05:00.0: bound etnaviv-gpu,3d.1 (ops gpu_ops [etnaviv]) etnaviv-gpu etnaviv-gpu,3d.0: model: GC9200, revision: 6304 etnaviv-gpu etnaviv-gpu,3d.1: model: GC9200, revision: 6304 [drm] Initialized etnaviv 1.3.0 20151214 for 0000:05:00.0 on minor 0 $ cd /sys/kernel/debug/dri/0 $ cat gpu etnaviv-gpu,3d.0 Status: identity model: 0x9200 revision: 0x6304 product_id: 0x92004 customer_id: 0x49 eco_id: 0x0 features major_features: 0xe0287cad minor_features0: 0xc9799eff minor_features1: 0xfefbfadb minor_features2: 0xeb9d6fbf minor_features3: 0xedfffcfd minor_features4: 0xdb0dafc7 minor_features5: 0xbb5ac733 minor_features6: 0x00000000 minor_features7: 0x00000000 minor_features8: 0x00000000 minor_features9: 0x00000000 minor_features10: 0x00000000 minor_features11: 0x00000000 specs stream_count: 16 register_max: 64 thread_count: 4096 vertex_cache_size: 16 shader_core_count: 16 nn_core_count: 0 pixel_pipes: 1 vertex_output_buffer_size: 1024 buffer_size: 0 instruction_count: 256 num_constants: 320 varyings_count: 16 axi: 0x00000000 idle: 0x7fffffff DMA seems to be stuck address 0: 0xccd2a7e8 address 1: 0xccd2a7e8 state 0: 0x00000000 state 1: 0x00000000 last fetch 64 bit word: 0x08ddbdb6 0x85ec1955 etnaviv-gpu,3d.1 Status: identity model: 0x9200 revision: 0x6304 product_id: 0x92004 customer_id: 0x49 eco_id: 0x0 features major_features: 0xe0287cad minor_features0: 0xc9799eff minor_features1: 0xfefbfadb minor_features2: 0xeb9d6fbf minor_features3: 0xedfffcfd minor_features4: 0xdb0dafc7 minor_features5: 0xbb5ac733 minor_features6: 0x00000000 minor_features7: 0x00000000 minor_features8: 0x00000000 minor_features9: 0x00000000 minor_features10: 0x00000000 minor_features11: 0x00000000 specs stream_count: 16 register_max: 64 thread_count: 4096 vertex_cache_size: 16 shader_core_count: 16 nn_core_count: 0 pixel_pipes: 1 vertex_output_buffer_size: 1024 buffer_size: 0 instruction_count: 256 num_constants: 320 varyings_count: 16 axi: 0x00000000 idle: 0x7fffffff DMA seems to be stuck address 0: 0x5756fef8 address 1: 0x5756fef8 state 0: 0x00000000 state 1: 0x00000000 last fetch 64 bit word: 0x68de88ef 0xcffa3d57 Tested with LingJiu GP102 GPU, only brief product overview is available[2]. [2] http://www.goldendisk.cn/index.php?s=index/show/index&id=3028 $ dmesg | grep etnaviv: etnaviv 0000:06:00.0: LingJiu GP102 has 2 GPU cores etnaviv 0000:06:00.0: bound etnaviv-gpu,3d.0 (ops gpu_ops [etnaviv]) etnaviv 0000:06:00.0: bound etnaviv-gpu,2d.0 (ops gpu_ops [etnaviv]) etnaviv-gpu etnaviv-gpu,3d.0: model: GC860, revision: 4601 etnaviv-gpu etnaviv-gpu,2d.0: model: GC300, revision: 2000 [drm] Initialized etnaviv 1.3.0 20151214 for 0000:06:00.0 on minor 0 $ cd /sys/kernel/debug/dri/0 $ cat gpu etnaviv-gpu,3d.0 Status: identity model: 0x860 revision: 0x4601 product_id: 0x0 customer_id: 0x0 eco_id: 0x0 features major_features: 0xe02c2ced minor_features0: 0xcbf99fff minor_features1: 0x00000001 minor_features2: 0x00000000 minor_features3: 0x00000000 minor_features4: 0x00000000 minor_features5: 0x00000000 minor_features6: 0x00000000 minor_features7: 0x00000000 minor_features8: 0x00000000 minor_features9: 0x00000000 minor_features10: 0x00000000 minor_features11: 0x00000000 specs stream_count: 1 register_max: 64 thread_count: 256 vertex_cache_size: 8 shader_core_count: 1 nn_core_count: 0 pixel_pipes: 1 vertex_output_buffer_size: 512 buffer_size: 0 instruction_count: 256 num_constants: 168 varyings_count: 8 axi: 0x00000000 idle: 0x7fffffff DMA seems to be stuck address 0: 0x00000000 address 1: 0x00000000 state 0: 0x00000000 state 1: 0x00000000 last fetch 64 bit word: 0x00000000 0x00000000 etnaviv-gpu,2d.0 Status: identity model: 0x300 revision: 0x2000 product_id: 0x0 customer_id: 0x0 eco_id: 0x0 features major_features: 0xe02c2ee9 minor_features0: 0xcbf99fff minor_features1: 0x00000001 minor_features2: 0x00000000 minor_features3: 0x00000000 minor_features4: 0x00000000 minor_features5: 0x00000000 minor_features6: 0x00000000 minor_features7: 0x00000000 minor_features8: 0x00000000 minor_features9: 0x00000000 minor_features10: 0x00000000 minor_features11: 0x00000000 specs stream_count: 1 register_max: 64 thread_count: 256 vertex_cache_size: 8 shader_core_count: 1 nn_core_count: 0 pixel_pipes: 1 vertex_output_buffer_size: 512 buffer_size: 0 instruction_count: 256 num_constants: 168 varyings_count: 8 axi: 0x00000000 idle: 0x7fffffff DMA seems to be stuck address 0: 0x00000000 address 1: 0x00000000 state 0: 0x00000000 state 1: 0x00000000 last fetch 64 bit word: 0x00000000 0x00000000 Sui Jingfeng (7): drm/etnaviv: Add a helper function to get clocks drm/etnaviv: Add constructor and destructor for the etnaviv_drm_private struct drm/etnaviv: Embed struct drm_device in struct etnaviv_drm_private drm/etnaviv: Add support for cached coherent caching mode drm/etnaviv: Replace the '&pdev->dev' with 'dev' drm/etnaviv: Update the implement of etnaviv_create_platform_device() drm/etnaviv: Add support for vivante GPU cores attached via PCI(e) drivers/gpu/drm/etnaviv/Kconfig | 8 + drivers/gpu/drm/etnaviv/Makefile | 2 + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 157 ++++++++----- drivers/gpu/drm/etnaviv/etnaviv_drv.h | 24 ++ drivers/gpu/drm/etnaviv/etnaviv_gem.c | 22 +- drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 146 ++++++++---- drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 4 + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c | 224 +++++++++++++++++++ drivers/gpu/drm/etnaviv/etnaviv_pci_drv.h | 18 ++ include/uapi/drm/etnaviv_drm.h | 1 + 12 files changed, 502 insertions(+), 110 deletions(-) create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_pci_drv.c create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_pci_drv.h -- 2.34.1
