Commit 34e88f9e authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Qiang Yu

drm/lima: Reduce the amount of logs on deferred probe

There is no point to print deferred probe (and its failures to get
resources) as an error.  For example getting a regulator causes three
unneeded error messages:

    lima 13000000.gpu: failed to get regulator: -517
    lima 13000000.gpu: regulator init fail -517
    lima 13000000.gpu: Fatal error during GPU init

Also do not print clock rates before the initialization finishes
because they will be duplicated after deferral.  Each probe step already
prints error so remove the final error message "Fatal error during GPU
init".

In case of multiple probe tries this would pollute the dmesg.

Fixes: a1d2a633 ("drm/lima: driver for ARM Mali4xx GPUs")
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarQiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621162117.22533-2-krzk@kernel.org
parent adbb48bc
...@@ -80,7 +80,6 @@ const char *lima_ip_name(struct lima_ip *ip) ...@@ -80,7 +80,6 @@ const char *lima_ip_name(struct lima_ip *ip)
static int lima_clk_init(struct lima_device *dev) static int lima_clk_init(struct lima_device *dev)
{ {
int err; int err;
unsigned long bus_rate, gpu_rate;
dev->clk_bus = devm_clk_get(dev->dev, "bus"); dev->clk_bus = devm_clk_get(dev->dev, "bus");
if (IS_ERR(dev->clk_bus)) { if (IS_ERR(dev->clk_bus)) {
...@@ -94,12 +93,6 @@ static int lima_clk_init(struct lima_device *dev) ...@@ -94,12 +93,6 @@ static int lima_clk_init(struct lima_device *dev)
return PTR_ERR(dev->clk_gpu); return PTR_ERR(dev->clk_gpu);
} }
bus_rate = clk_get_rate(dev->clk_bus);
dev_info(dev->dev, "bus rate = %lu\n", bus_rate);
gpu_rate = clk_get_rate(dev->clk_gpu);
dev_info(dev->dev, "mod rate = %lu", gpu_rate);
err = clk_prepare_enable(dev->clk_bus); err = clk_prepare_enable(dev->clk_bus);
if (err) if (err)
return err; return err;
...@@ -145,7 +138,8 @@ static int lima_regulator_init(struct lima_device *dev) ...@@ -145,7 +138,8 @@ static int lima_regulator_init(struct lima_device *dev)
dev->regulator = NULL; dev->regulator = NULL;
if (ret == -ENODEV) if (ret == -ENODEV)
return 0; return 0;
dev_err(dev->dev, "failed to get regulator: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(dev->dev, "failed to get regulator: %d\n", ret);
return ret; return ret;
} }
...@@ -297,10 +291,8 @@ int lima_device_init(struct lima_device *ldev) ...@@ -297,10 +291,8 @@ int lima_device_init(struct lima_device *ldev)
} }
err = lima_regulator_init(ldev); err = lima_regulator_init(ldev);
if (err) { if (err)
dev_err(ldev->dev, "regulator init fail %d\n", err);
goto err_out0; goto err_out0;
}
ldev->empty_vm = lima_vm_create(ldev); ldev->empty_vm = lima_vm_create(ldev);
if (!ldev->empty_vm) { if (!ldev->empty_vm) {
...@@ -343,6 +335,9 @@ int lima_device_init(struct lima_device *ldev) ...@@ -343,6 +335,9 @@ int lima_device_init(struct lima_device *ldev)
if (err) if (err)
goto err_out5; goto err_out5;
dev_info(ldev->dev, "bus rate = %lu\n", clk_get_rate(ldev->clk_bus));
dev_info(ldev->dev, "mod rate = %lu", clk_get_rate(ldev->clk_gpu));
return 0; return 0;
err_out5: err_out5:
......
...@@ -307,10 +307,8 @@ static int lima_pdev_probe(struct platform_device *pdev) ...@@ -307,10 +307,8 @@ static int lima_pdev_probe(struct platform_device *pdev)
ldev->ddev = ddev; ldev->ddev = ddev;
err = lima_device_init(ldev); err = lima_device_init(ldev);
if (err) { if (err)
dev_err(&pdev->dev, "Fatal error during GPU init\n");
goto err_out1; goto err_out1;
}
/* /*
* Register the DRM device with the core and the connectors with * Register the DRM device with the core and the connectors with
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment