Introduce component framework to avoid potential cyclic dependency problem. The whole driver won't finish bound before all submodules are ready, respective modules just do fundimental works in their probe() function, such as allocating storage for themselves, mapping mmio, and handling the external dependencies. v1 -> v2: * Squash patch 0002 and patch 0003 into one * Fill typos and improve commit message v2 -> v3: * Squash all patch into one * Create another platform device as drm proxy master. * Make LSDC PCI driver as a subcomponent as well. v3 -> v4: * Tiny refinement and clean up. Tested with ls3a6000+ls7a2000: [ 11.307887] loongson 0000:00:06.1: Found LS7A2000 bridge chipset, revision: 2 [ 11.316701] loongson 0000:00:06.1: i2c-6(sda pin mask=1, scl pin mask=2) created [ 11.325318] loongson 0000:00:06.1: i2c-7(sda pin mask=4, scl pin mask=8) created [ 12.644855] loongson 0000:00:06.1: lsdc-output.0 probed, type: HDMI-or-VGA [ 12.654461] loongson 0000:00:06.1: lsdc-output.1 probed, type: HDMI [ 12.661175] loongson 0000:00:06.1: [drm] dc: 400MHz, gmc: 1200MHz, gpu: 480MHz [ 12.669027] loongson loongson: bound lsdc-output.0 (ops lsdc_output_component_ops [loongson]) [ 12.677968] loongson loongson: bound lsdc-output.1 (ops lsdc_output_component_ops [loongson]) [ 12.686578] loongson 0000:00:06.1: [drm] Dedicated vram start: 0xe0020000000, size: 256MiB [ 12.700799] loongson 0000:00:06.1: lsdc irq: 61 [ 12.700802] loongson loongson: bound 0000:00:06.1 (ops lsdc_component_ops [loongson]) [ 12.700825] loongson 0000:00:06.1: [drm] LoongGPU(TM): LG110, revision: 0, Host: LS7A2000 [ 12.700835] loongson 0000:00:06.1: [drm] LoongGPU irq: 62 [ 12.700837] loongson loongson: bound 0000:00:06.0 (ops loonggpu_component_ops [loongson]) [ 12.700870] loongson 0000:00:06.1: [drm] Total 2 outputs [ 12.706489] loongson 0000:00:06.1: [drm] VRAM: 16384 pages ready [ 12.746614] loongson 0000:00:06.1: [drm] GTT: 32768 pages ready [ 12.792895] [drm] Initialized loongson 1.0.0 for 0000:00:06.1 on minor 0 [ 12.879707] loongson 0000:00:06.1: [drm] fb0: loongsondrmfb frame buffer device [ 16.952830] loongson 0000:00:06.1: vgaarb: VGA decodes changed: olddecodes=io+mem,decodes=none:owns=io+mem Tested with ls3a5000+ls7a1000: [ 10.509247] loongson.lsdc 0000:00:06.1: Found LS7A2000 bridge chipset, revision: 2 [ 10.574274] loongson.lsdc 0000:00:06.1: i2c-6(sda pin mask=1, scl pin mask=2) created [ 10.624394] loongson.lsdc 0000:00:06.1: i2c-7(sda pin mask=4, scl pin mask=8) created [ 10.643855] loongson.lsdc 0000:00:06.1: loongson.output.agent.0 probed, type: HDMI-or-VGA [ 10.656206] loongson.lsdc 0000:00:06.1: loongson.output.agent.1 probed, type: HDMI [ 11.739180] loongson.loonggpu 0000:00:06.0: LoongGPU PCI driver probed [ 11.875815] loongson loongson: drm proxy probed [ 11.880345] loongson.lsdc 0000:00:06.1: [drm] Dedicated vram start: 0xe0020000000, size: 256MiB [ 11.889019] loongson.lsdc 0000:00:06.1: [drm] dc: 400MHz, gmc: 1200MHz, gpu: 480MHz [ 11.896673] loongson loongson: bound loongson.output.agent.0 (ops lsdc_output_component_ops [loongson]) [ 11.906046] loongson loongson: bound loongson.output.agent.1 (ops lsdc_output_component_ops [loongson]) [ 11.921372] loongson.lsdc 0000:00:06.1: lsdc irq: 61 [ 11.926319] loongson loongson: bound 0000:00:06.1 (ops lsdc_pci_component_ops [loongson]) [ 11.934474] loongson.lsdc 0000:00:06.1: [drm] LoongGPU(TM): LG110, revision: 0, Host: LS7A2000 [ 11.943055] loongson.lsdc 0000:00:06.1: [drm] LoongGPU irq: 62 [ 11.948869] loongson loongson: bound 0000:00:06.0 (ops loonggpu_component_ops [loongson]) [ 11.997246] loongson.lsdc 0000:00:06.1: [drm] VRAM: 16384 pages ready [ 12.003665] loongson.lsdc 0000:00:06.1: [drm] GTT: 32768 pages ready [ 12.010295] [drm] Initialized loongson 1.0.0 for 0000:00:06.1 on minor 1 [ 12.087732] loongson.lsdc 0000:00:06.1: [drm] fb0: loongsondrmfb frame buffer device [ 12.115177] loongson: total 4 drivers registered [ 16.110934] loongson.lsdc 0000:00:06.1: vgaarb: VGA decodes changed: olddecodes=io+mem,decodes=none:owns=io+mem [root@fedora 0]# cd /sys/kernel/debug/dri/0000\:00\:06.1/ [root@fedora 0000:00:06.1]# ls benchmark clients crtc-1 framebuffer HDMI-A-1 mm vram_mm bos clocks encoder-0 gem_names HDMI-A-2 name chips crtc-0 encoder-1 gtt_mm internal_clients state [root@fedora 0000:00:06.1]# cat bos bo[0000][0000000033d33c9c]: size: 8112KiB VRAM offset: 0 bo[0001][0000000059581d0a]: size: 8112KiB VRAM offset: 7ec000 bo[0002][00000000e7eec263]: size: 16KiB VRAM offset: 0 bo[0003][00000000d4fb6ef2]: size: 16KiB VRAM offset: fff8000 Pinned BO size: VRAM: 8128KiB, GTT: 0 KiB [root@fedora 0000:00:06.1]# cat chips Running on cpu 0xc0, cpu revision: 0x11 Contained in: LS7A2000 bridge chipset [root@fedora 0000:00:06.1]# cat benchmark Copy bo of 8100KiB 60 times from GTT to GTT in 48ms: 10125MB/s Copy bo of 8100KiB 60 times from GTT to VRAM in 104ms: 4673MB/s Copy bo of 8100KiB 60 times from VRAM to GTT in 13480ms: 36MB/s Also run IGT kms_flip and fbdev tests, no obvious problem found. Sui Jingfeng (1): drm/loongson: Introduce component framework support drivers/gpu/drm/loongson/Makefile | 6 + drivers/gpu/drm/loongson/loonggpu_pci_drv.c | 163 ++++++++ drivers/gpu/drm/loongson/loonggpu_pci_drv.h | 35 ++ drivers/gpu/drm/loongson/loongson_device.c | 30 ++ drivers/gpu/drm/loongson/loongson_drv.c | 293 +++++++++++++ drivers/gpu/drm/loongson/loongson_drv.h | 90 ++++ drivers/gpu/drm/loongson/loongson_module.c | 84 +++- drivers/gpu/drm/loongson/loongson_module.h | 32 ++ drivers/gpu/drm/loongson/lsdc_benchmark.c | 12 +- drivers/gpu/drm/loongson/lsdc_benchmark.h | 2 +- drivers/gpu/drm/loongson/lsdc_component.c | 159 +++++++ drivers/gpu/drm/loongson/lsdc_crtc.c | 4 +- drivers/gpu/drm/loongson/lsdc_debugfs.c | 44 +- drivers/gpu/drm/loongson/lsdc_drv.c | 394 ++---------------- drivers/gpu/drm/loongson/lsdc_drv.h | 83 +--- drivers/gpu/drm/loongson/lsdc_gem.c | 44 +- drivers/gpu/drm/loongson/lsdc_gem.h | 19 +- drivers/gpu/drm/loongson/lsdc_gfxpll.c | 29 +- drivers/gpu/drm/loongson/lsdc_gfxpll.h | 3 +- drivers/gpu/drm/loongson/lsdc_i2c.c | 43 +- drivers/gpu/drm/loongson/lsdc_i2c.h | 12 +- drivers/gpu/drm/loongson/lsdc_output.c | 183 ++++++++ drivers/gpu/drm/loongson/lsdc_output.h | 36 +- drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 14 +- drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 20 +- drivers/gpu/drm/loongson/lsdc_plane.c | 4 +- drivers/gpu/drm/loongson/lsdc_ttm.c | 84 ++-- drivers/gpu/drm/loongson/lsdc_ttm.h | 4 +- 28 files changed, 1318 insertions(+), 608 deletions(-) create mode 100644 drivers/gpu/drm/loongson/loonggpu_pci_drv.c create mode 100644 drivers/gpu/drm/loongson/loonggpu_pci_drv.h create mode 100644 drivers/gpu/drm/loongson/loongson_drv.c create mode 100644 drivers/gpu/drm/loongson/loongson_drv.h create mode 100644 drivers/gpu/drm/loongson/lsdc_component.c create mode 100644 drivers/gpu/drm/loongson/lsdc_output.c -- 2.43.0
