Am Dienstag, dem 20.06.2023 um 17:47 +0800 schrieb Sui Jingfeng:
> From: Sui Jingfeng <suijingfeng@xxxxxxxxxxx>
>
> Originally, component frameworks were used to bind multiple GPU cores to a
> virtual master. But there are chips that have only one GPU core integrated.
> The component framework can be avoided under some circumstances, Another
> reason is that usperspace programs such as X server and Mesa will try to
> find the PCI device to use by default. Creating a virtual master device
> for PCI GPUs cause unnecessary troubles.
>
> This patch add additional code paths to allow bypassing the component
> frameworks, platforms with a single GPU core could probably try the
> non-component code path also. This patch is for code shaing between the
> PCI driver and the platform driver.
>
> Cc: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> Cc: Christian Gmeiner <christian.gmeiner@xxxxxxxxx>
> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> Cc: Daniel Vetter <daniel@xxxxxxxx>
> Signed-off-by: Sui Jingfeng <suijingfeng@xxxxxxxxxxx>
> ---
> drivers/gpu/drm/etnaviv/etnaviv_drv.c | 47 ++++++++++-----
> drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 83 +++++++++++++++++----------
> drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 3 +
> 3 files changed, 91 insertions(+), 42 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> index 6a048be02857..93ca240cd4c0 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
> @@ -536,10 +536,9 @@ static const struct drm_driver etnaviv_drm_driver = {
> .minor = 3,
> };
>
> -/*
> - * Platform driver:
> - */
> -static int etnaviv_bind(struct device *dev)
> +static struct etnaviv_drm_private *etna_private_ptr;
That's not going to fly. You are dropping the virtual master device,
which bundles multiple GPUs together, but you are also only allowing a
single GPU instance via this global private data pointer.
I'm okay with dropping the virtual master and instantiating a DRM
device for each PCI device, but then the driver at least needs to be
able to handle multiple instances.
Also what exactly is the problem with the virtual master device?
Couldn't we just instantiate one of those for each PCI device to
minimize the changes needed to the bind/unbind logic?
Regards,
Lucas
> +
> +static int etnaviv_drm_bind(struct device *dev, bool component)
> {
> struct etnaviv_drm_private *priv;
> struct drm_device *drm;
> @@ -556,12 +555,15 @@ static int etnaviv_bind(struct device *dev)
> }
>
> drm->dev_private = priv;
> + etna_private_ptr = priv;
>
> dma_set_max_seg_size(dev, SZ_2G);
>
> - dev_set_drvdata(dev, drm);
> + if (component)
> + ret = component_bind_all(dev, drm);
> + else
> + ret = etnaviv_gpu_bind(dev, NULL, drm);
>
> - ret = component_bind_all(dev, drm);
> if (ret < 0)
> goto out_free_priv;
>
> @@ -574,7 +576,10 @@ static int etnaviv_bind(struct device *dev)
> return 0;
>
> out_unbind:
> - component_unbind_all(dev, drm);
> + if (component)
> + component_unbind_all(dev, drm);
> + else
> + etnaviv_gpu_unbind(dev, NULL, drm);
> out_free_priv:
> etnaviv_free_private(priv);
> out_put:
> @@ -583,14 +588,17 @@ static int etnaviv_bind(struct device *dev)
> return ret;
> }
>
> -static void etnaviv_unbind(struct device *dev)
> +static void etnaviv_drm_unbind(struct device *dev, bool component)
> {
> - struct drm_device *drm = dev_get_drvdata(dev);
> - struct etnaviv_drm_private *priv = drm->dev_private;
> + struct etnaviv_drm_private *priv = etna_private_ptr;
> + struct drm_device *drm = priv->drm;
>
> drm_dev_unregister(drm);
>
> - component_unbind_all(dev, drm);
> + if (component)
> + component_unbind_all(dev, drm);
> + else
> + etnaviv_gpu_unbind(dev, NULL, drm);
>
> etnaviv_free_private(priv);
>
> @@ -599,9 +607,22 @@ static void etnaviv_unbind(struct device *dev)
> drm_dev_put(drm);
> }
>
> +/*
> + * Platform driver:
> + */
> +static int etnaviv_master_bind(struct device *dev)
> +{
> + return etnaviv_drm_bind(dev, true);
> +}
> +
> +static void etnaviv_master_unbind(struct device *dev)
> +{
> + return etnaviv_drm_unbind(dev, true);
> +}
> +
> static const struct component_master_ops etnaviv_master_ops = {
> - .bind = etnaviv_bind,
> - .unbind = etnaviv_unbind,
> + .bind = etnaviv_master_bind,
> + .unbind = etnaviv_master_unbind,
> };
>
> static int etnaviv_pdev_probe(struct platform_device *pdev)
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> index 5e88fa95dac2..059be8c89c5a 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
> @@ -1737,8 +1737,7 @@ static const struct thermal_cooling_device_ops cooling_ops = {
> .set_cur_state = etnaviv_gpu_cooling_set_cur_state,
> };
>
> -static int etnaviv_gpu_bind(struct device *dev, struct device *master,
> - void *data)
> +int etnaviv_gpu_bind(struct device *dev, struct device *master, void *data)
> {
> struct drm_device *drm = data;
> struct etnaviv_drm_private *priv = drm->dev_private;
> @@ -1769,7 +1768,6 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master,
> if (ret < 0)
> goto out_sched;
>
> -
> gpu->drm = drm;
> gpu->fence_context = dma_fence_context_alloc(1);
> xa_init_flags(&gpu->user_fences, XA_FLAGS_ALLOC);
> @@ -1798,8 +1796,7 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master,
> return ret;
> }
>
> -static void etnaviv_gpu_unbind(struct device *dev, struct device *master,
> - void *data)
> +void etnaviv_gpu_unbind(struct device *dev, struct device *master, void *data)
> {
> struct etnaviv_gpu *gpu = dev_get_drvdata(dev);
>
> @@ -1867,9 +1864,11 @@ static int etnaviv_gpu_register_irq(struct etnaviv_gpu *gpu, int irq)
> return 0;
> }
>
> -static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
> +/* platform independent */
> +
> +static int etnaviv_gpu_driver_create(struct device *dev, void __iomem *mmio,
> + int irq, bool component, bool has_clk)
> {
> - struct device *dev = &pdev->dev;
> struct etnaviv_gpu *gpu;
> int err;
>
> @@ -1877,24 +1876,22 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
> if (!gpu)
> return -ENOMEM;
>
> - gpu->dev = &pdev->dev;
> + gpu->dev = dev;
> + gpu->mmio = mmio;
> mutex_init(&gpu->lock);
> mutex_init(&gpu->sched_lock);
>
> - /* Map registers: */
> - gpu->mmio = devm_platform_ioremap_resource(pdev, 0);
> - if (IS_ERR(gpu->mmio))
> - return PTR_ERR(gpu->mmio);
> -
> /* Get Interrupt: */
> - err = etnaviv_gpu_register_irq(gpu, platform_get_irq(pdev, 0));
> + err = etnaviv_gpu_register_irq(gpu, irq);
> if (err)
> return err;
>
> /* Get Clocks: */
> - err = etnaviv_gpu_clk_get(gpu);
> - if (err)
> - return err;
> + if (has_clk) {
> + err = etnaviv_gpu_clk_get(gpu);
> + if (err)
> + return err;
> + }
>
> /* TODO: figure out max mapped size */
> dev_set_drvdata(dev, gpu);
> @@ -1904,24 +1901,27 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
> * autosuspend delay is rather arbitary: no measurements have
> * yet been performed to determine an appropriate value.
> */
> - pm_runtime_use_autosuspend(gpu->dev);
> - pm_runtime_set_autosuspend_delay(gpu->dev, 200);
> - pm_runtime_enable(gpu->dev);
> -
> - err = component_add(&pdev->dev, &gpu_ops);
> - if (err < 0) {
> - dev_err(&pdev->dev, "failed to register component: %d\n", err);
> - return err;
> + pm_runtime_use_autosuspend(dev);
> + pm_runtime_set_autosuspend_delay(dev, 200);
> + pm_runtime_enable(dev);
> +
> + if (component) {
> + err = component_add(dev, &gpu_ops);
> + if (err < 0) {
> + dev_err(dev, "failed to register component: %d\n", err);
> + return err;
> + }
> }
>
> return 0;
> }
>
> -static int etnaviv_gpu_platform_remove(struct platform_device *pdev)
> +static void etnaviv_gpu_driver_destroy(struct device *dev, bool component)
> {
> - component_del(&pdev->dev, &gpu_ops);
> - pm_runtime_disable(&pdev->dev);
> - return 0;
> + if (component)
> + component_del(dev, &gpu_ops);
> +
> + pm_runtime_disable(dev);
> }
>
> static int etnaviv_gpu_rpm_suspend(struct device *dev)
> @@ -1971,6 +1971,31 @@ static const struct dev_pm_ops etnaviv_gpu_pm_ops = {
> RUNTIME_PM_OPS(etnaviv_gpu_rpm_suspend, etnaviv_gpu_rpm_resume, NULL)
> };
>
> +static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + void __iomem *mmio;
> + int irq;
> +
> + /* Map registers: */
> + mmio = devm_platform_ioremap_resource(pdev, 0);
> + if (IS_ERR(mmio))
> + return PTR_ERR(mmio);
> +
> + irq = platform_get_irq(pdev, 0);
> +
> + return etnaviv_gpu_driver_create(dev, mmio, irq, true, true);
> +}
> +
> +static int etnaviv_gpu_platform_remove(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> +
> + etnaviv_gpu_driver_destroy(dev, true);
> +
> + return 0;
> +}
> +
> struct platform_driver etnaviv_gpu_driver = {
> .driver = {
> .name = "etnaviv-gpu",
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> index 98c6f9c320fc..1ec829a649b5 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.h
> @@ -206,6 +206,9 @@ void etnaviv_gpu_pm_put(struct etnaviv_gpu *gpu);
> int etnaviv_gpu_wait_idle(struct etnaviv_gpu *gpu, unsigned int timeout_ms);
> void etnaviv_gpu_start_fe(struct etnaviv_gpu *gpu, u32 address, u16 prefetch);
>
> +int etnaviv_gpu_bind(struct device *dev, struct device *master, void *data);
> +void etnaviv_gpu_unbind(struct device *dev, struct device *master, void *data);
> +
> extern struct platform_driver etnaviv_gpu_driver;
>
> #endif /* __ETNAVIV_GPU_H__ */
