gpu: host1x: Split up client initalization and registration
PATCH 1/2 gpu: host1x: Split up client initalization and registration
From: Thierry Reding <[email protected]>
In some cases we may need to initialize the host1x client first before registering it. This commit adds a new helper that will do nothing but the initialization of the data structure.
At the same time, the initialization is removed from the registration function. Note, however, that for simplicity we explicitly initialize the client when the host1x_client_register() function is called, as opposed to the low-level __host1x_client_register() function. This allows existing callers to remain unchanged.
--- drivers/gpu/host1x/bus.c | 30 ++++++++++++++++++++++++------ include/linux/host1x.h | 30 ++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 12 deletions(-)
drivers/gpu/host1x/bus.c +24 -6
@@ -735,6 +735,29 @@ void host1x_driver_unregister(struct host1x_driver *driver) }EXPORT_SYMBOL (host1x_driver_unregister); +/** +* __host1x_client_init() - initialize a host1x client +* @client: host1x client +* @key: lock class key for the client-specific mutex +*/ +void __host1x_client_init (struct host1x_client *client,struct lock_class_key *key) +{ +INIT_LIST_HEAD (&client->list); +__mutex_init (&client->lock,"host1x client lock" , key); + client->usecount =0 ; +} +EXPORT_SYMBOL (__host1x_client_init); + +/** +* host1x_client_exit() - uninitialize a host1x client +* @client: host1x client +*/ +void host1x_client_exit (struct host1x_client *client) +{ +mutex_destroy (&client->lock); +} +EXPORT_SYMBOL (host1x_client_exit); +/** * __host1x_client_register() - register a host1x client * @client: host1x client
@@ -747,16 +770,11 @@ EXPORT_SYMBOL(host1x_driver_unregister);* device and call host1x_device_init(), which will in turn call each client's * &host1x_client_ops.init implementation. */ -int __host1x_client_register (struct host1x_client *client, -struct lock_class_key *key) +int __host1x_client_register (struct host1x_client *client) {struct host1x *host1x;int err; -INIT_LIST_HEAD (&client->list); -__mutex_init (&client->lock,"host1x client lock" , key); - client->usecount =0 ; -mutex_lock (&devices_lock);list_for_each_entry (host1x, &devices, list) {
include/linux/host1x.h +24 -6
@@ -349,12 +349,30 @@ static inline struct host1x_device *to_host1x_device(struct device *dev)int host1x_device_init (struct host1x_device *device);int host1x_device_exit (struct host1x_device *device); -int __host1x_client_register (struct host1x_client *client, -struct lock_class_key *key); -#define host1x_client_register (class) \ - ({ \ - static struct lock_class_key __key; \ - __host1x_client_register(class, &__key); \ +void __host1x_client_init (struct host1x_client *client,struct lock_class_key *key); +void host1x_client_exit (struct host1x_client *client); + +#define host1x_client_init (client) \ + ({ \ + static struct lock_class_key __key; \ + __host1x_client_init(client, &__key); \ + }) + +int __host1x_client_register (struct host1x_client *client); + +/* +* Note that this wrapper calls __host1x_client_init() for compatibility +* with existing callers. Callers that want to separately initialize and +* register a host1x client must first initialize using either of the +* __host1x_client_init() or host1x_client_init() functions and then use +* the low-level __host1x_client_register() function to avoid the client +* getting reinitialized. +*/ +#define host1x_client_register (client) \ + ({ \ + static struct lock_class_key __key; \ + __host1x_client_init(client, &__key); \ + __host1x_client_register(client); \ })int host1x_client_unregister (struct host1x_client *client);
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/2 drm/tegra: sor: Fully initialize SOR before registration
From: Thierry Reding <[email protected]>
Before registering the SOR host1x client, make sure that it is fully initialized. This avoids a potential race condition between the SOR's probe and the host1x device initialization in cases where the SOR is the final sub-device to register to a host1x instance.
--- drivers/gpu/drm/tegra/sor.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/gpu/drm/tegra/sor.c +13 -14
@@ -3916,17 +3916,10 @@ static int tegra_sor_probe(struct platform_device *pdev)platform_set_drvdata (pdev, sor);pm_runtime_enable (&pdev->dev); -INIT_LIST_HEAD (&sor->client.list); +host1x_client_init (&sor->client); sor->client.ops = &sor_client_ops; sor->client.dev = &pdev->dev; - err =host1x_client_register (&sor->client); -if (err <0 ) { -dev_err (&pdev->dev,"failed to register host1x client: %d\n" , - err); - goto rpm_disable; - } -/* * On Tegra210 and earlier, provide our own implementation for the * pad output clock.
@@ -3938,13 +3931,13 @@ static int tegra_sor_probe(struct platform_device *pdev) sor->index);if (!name) { err = -ENOMEM ; - goto unregister; + goto uninit; } err =host1x_client_resume (&sor->client);if (err <0 ) {dev_err (sor->dev,"failed to resume: %d\n" , err); - goto unregister; + goto uninit; } sor->clk_pad =tegra_clk_sor_pad_register (sor, name);
@@ -3955,14 +3948,20 @@ static int tegra_sor_probe(struct platform_device *pdev) err =PTR_ERR (sor->clk_pad);dev_err (sor->dev,"failed to register SOR pad clock: %d\n" , err); - goto unregister; + goto uninit; + } + + err =__host1x_client_register (&sor->client); +if (err <0 ) { +dev_err (&pdev->dev,"failed to register host1x client: %d\n" , + err); + goto uninit; }return 0 ; -unregister: -host1x_client_unregister (&sor->client); -rpm_disable: +uninit: +host1x_client_exit (&sor->client);pm_runtime_disable (&pdev->dev); remove:tegra_output_remove (&sor->output);
Signature · 6 lines
2.30.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/2] drm/tegra: sor: Fully initialize SOR before registration
Quoted 68 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Before registering the SOR host1x client, make sure that it is fully initialized. This avoids a potential race condition between the SOR's probe and the host1x device initialization in cases where the SOR is the final sub-device to register to a host1x instance.
Reported-by Jonathan Hunter <[email protected]>Signed-off-by Thierry Reding <[email protected]>--- drivers/gpu/drm/tegra/sor.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)drivers/gpu/drm/tegra/sor.c +11
-11@@ -3916,17 +3916,10 @@ static int tegra_sor_probe(struct platform_device *pdev)platform_set_drvdata (pdev, sor);pm_runtime_enable (&pdev->dev); -INIT_LIST_HEAD (&sor->client.list); +host1x_client_init (&sor->client); sor->client.ops = &sor_client_ops; sor->client.dev = &pdev->dev; - err =host1x_client_register (&sor->client); -if (err <0 ) { -dev_err (&pdev->dev,"failed to register host1x client: %d\n" , - err); - goto rpm_disable; - } -/* * On Tegra210 and earlier, provide our own implementation for the * pad output clock. @@ -3938,13 +3931,13 @@ static int tegra_sor_probe(struct platform_device *pdev) sor->index);if (!name) { err = -ENOMEM ; - goto unregister; + goto uninit; } err =host1x_client_resume (&sor->client);if (err <0 ) {dev_err (sor->dev,"failed to resume: %d\n" , err); - goto unregister; + goto uninit; } sor->clk_pad =tegra_clk_sor_pad_register (sor, name);@@ -3955,14 +3948,20 @@ static int tegra_sor_probe(struct platform_device *pdev) err =PTR_ERR (sor->clk_pad);dev_err (sor->dev,"failed to register SOR pad clock: %d\n" , err); - goto unregister; + goto uninit; + } + + err =__host1x_client_register (&sor->client); +if (err <0 ) { +dev_err (&pdev->dev,"failed to register host1x client: %d\n" , + err); + goto uninit; }
drivers/gpu/drm/tegra/sor.c static int tegra_sor_probe(struct platform_device *pdev) · line 3967
Quoted 10 lines
drivers/gpu/drm/tegra/sor.c +2
-3return 0 ; -unregister: -host1x_client_unregister (&sor->client); -rpm_disable: +uninit: +host1x_client_exit (&sor->client);pm_runtime_disable (&pdev->dev); remove:tegra_output_remove (&sor->output);
Thanks! Completed 200 boots on Jetson TX1 without any further probing issues, so ...
Cheers
Jon
Signature · 1 line
nvpublic