Re: [PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-11 Thread Dmitry Osipenko 
On 04.05.2018 16:37, Thierry Reding wrote:
> From: Thierry Reding 
> 
> Attaching to and detaching from an IOMMU uses the same code sequence in
> every driver, so factor it out into separate helpers.
> 
> Signed-off-by: Thierry Reding 
> ---
>  drivers/gpu/drm/tegra/dc.c   | 42 ++--
>  drivers/gpu/drm/tegra/drm.c  | 42 
>  drivers/gpu/drm/tegra/drm.h  |  4 
>  drivers/gpu/drm/tegra/gr2d.c | 32 +++
>  drivers/gpu/drm/tegra/gr3d.c | 31 ++
>  5 files changed, 68 insertions(+), 83 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> index c843f11043db..3e7ec3937346 100644
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client *client)
>   if (!dc->syncpt)
>   dev_warn(dc->dev, "failed to allocate syncpoint\n");
>  
> - if (tegra->domain) {
> - dc->group = iommu_group_get(client->dev);
> -
> - if (dc->group && dc->group != tegra->group) {
> - err = iommu_attach_group(tegra->domain, dc->group);
> - if (err < 0) {
> - dev_err(dc->dev,
> - "failed to attach to domain: %d\n",
> - err);
> - iommu_group_put(dc->group);
> - return err;
> - }
> -
> - tegra->group = dc->group;
> - }
> + dc->group = host1x_client_iommu_attach(client, true);
> + if (IS_ERR(dc->group)) {
> + err = PTR_ERR(dc->group);
> + dev_err(client->dev, "failed to attach to domain: %d\n", err);
> + return err;
>   }
>  
>   if (dc->soc->wgrps)
> @@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client *client)
>   if (!IS_ERR(primary))
>   drm_plane_cleanup(primary);
>  
> - if (dc->group) {
> - if (dc->group == tegra->group) {
> - iommu_detach_group(tegra->domain, dc->group);
> - tegra->group = NULL;
> - }
> -
> - iommu_group_put(dc->group);
> - }
> -
> + host1x_client_iommu_detach(client, dc->group);
>   host1x_syncpt_free(dc->syncpt);
>  
>   return err;
> @@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client *client)
>  
>  static int tegra_dc_exit(struct host1x_client *client)
>  {
> - struct drm_device *drm = dev_get_drvdata(client->parent);
>   struct tegra_dc *dc = host1x_client_to_dc(client);
> - struct tegra_drm *tegra = drm->dev_private;
>   int err;
>  
>   devm_free_irq(dc->dev, dc->irq, dc);
> @@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client *client)
>   return err;
>   }
>  
> - if (dc->group) {
> - if (dc->group == tegra->group) {
> - iommu_detach_group(tegra->domain, dc->group);
> - tegra->group = NULL;
> - }
> -
> - iommu_group_put(dc->group);
> - }
> -
> + host1x_client_iommu_detach(client, dc->group);
>   host1x_syncpt_free(dc->syncpt);
>  
>   return 0;
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index 7afe2f635f74..bc1008305e1e 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm 
> *tegra,
>   return 0;
>  }
>  
> +struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client,
> +bool shared)
> +{
> + struct drm_device *drm = dev_get_drvdata(client->parent);
> + struct tegra_drm *tegra = drm->dev_private;
> + struct iommu_group *group = NULL;
> + int err;
> +
> + if (tegra->domain) {
> + group = iommu_group_get(client->dev);
> +
> + if (group && (!shared || (shared && (group != tegra->group {
> + err = iommu_attach_group(tegra->domain, group);
> + if (err < 0) {
> + iommu_group_put(group);
> + return ERR_PTR(err);
> + }
> +
> + if (shared && !tegra->group)
> + tegra->group = group;

Nit: Probably it doesn't make much sense to have devices unattached to BO's AS,
what about to error out here or at least display a error/warning message?

@@ -1796,7 +1796,12 @@ struct iommu_group *host1x_client_iommu_attach(struct
host1x_client *client,
if (tegra->domain) {
group = iommu_group_get(client->dev);

-   if (group && (!shared || (shared && (group != tegra->group {
+   if (!group) {
+   dev_err(client->dev, "Fa

Re: [PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-05 Thread Dmitry Osipenko 
On 04.05.2018 18:10, Thierry Reding wrote:
> On Fri, May 04, 2018 at 05:23:42PM +0300, Dmitry Osipenko wrote:
>> On 04.05.2018 16:37, Thierry Reding wrote:
>>> From: Thierry Reding 
>>>
>>> Attaching to and detaching from an IOMMU uses the same code sequence in
>>> every driver, so factor it out into separate helpers.
>>>
>>> Signed-off-by: Thierry Reding 
>>> ---
>>>  drivers/gpu/drm/tegra/dc.c   | 42 ++--
>>>  drivers/gpu/drm/tegra/drm.c  | 42 
>>>  drivers/gpu/drm/tegra/drm.h  |  4 
>>>  drivers/gpu/drm/tegra/gr2d.c | 32 +++
>>>  drivers/gpu/drm/tegra/gr3d.c | 31 ++
>>>  5 files changed, 68 insertions(+), 83 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
>>> index c843f11043db..3e7ec3937346 100644
>>> --- a/drivers/gpu/drm/tegra/dc.c
>>> +++ b/drivers/gpu/drm/tegra/dc.c
>>> @@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client 
>>> *client)
>>> if (!dc->syncpt)
>>> dev_warn(dc->dev, "failed to allocate syncpoint\n");
>>>  
>>> -   if (tegra->domain) {
>>> -   dc->group = iommu_group_get(client->dev);
>>> -
>>> -   if (dc->group && dc->group != tegra->group) {
>>> -   err = iommu_attach_group(tegra->domain, dc->group);
>>> -   if (err < 0) {
>>> -   dev_err(dc->dev,
>>> -   "failed to attach to domain: %d\n",
>>> -   err);
>>> -   iommu_group_put(dc->group);
>>> -   return err;
>>> -   }
>>> -
>>> -   tegra->group = dc->group;
>>> -   }
>>> +   dc->group = host1x_client_iommu_attach(client, true);
>>> +   if (IS_ERR(dc->group)) {
>>> +   err = PTR_ERR(dc->group);
>>> +   dev_err(client->dev, "failed to attach to domain: %d\n", err);
>>> +   return err;
>>> }
>>>  
>>> if (dc->soc->wgrps)
>>> @@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client 
>>> *client)
>>> if (!IS_ERR(primary))
>>> drm_plane_cleanup(primary);
>>>  
>>> -   if (dc->group) {
>>> -   if (dc->group == tegra->group) {
>>> -   iommu_detach_group(tegra->domain, dc->group);
>>> -   tegra->group = NULL;
>>> -   }
>>> -
>>> -   iommu_group_put(dc->group);
>>> -   }
>>> -
>>> +   host1x_client_iommu_detach(client, dc->group);
>>> host1x_syncpt_free(dc->syncpt);
>>>  
>>> return err;
>>> @@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client *client)
>>>  
>>>  static int tegra_dc_exit(struct host1x_client *client)
>>>  {
>>> -   struct drm_device *drm = dev_get_drvdata(client->parent);
>>> struct tegra_dc *dc = host1x_client_to_dc(client);
>>> -   struct tegra_drm *tegra = drm->dev_private;
>>> int err;
>>>  
>>> devm_free_irq(dc->dev, dc->irq, dc);
>>> @@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client 
>>> *client)
>>> return err;
>>> }
>>>  
>>> -   if (dc->group) {
>>> -   if (dc->group == tegra->group) {
>>> -   iommu_detach_group(tegra->domain, dc->group);
>>> -   tegra->group = NULL;
>>> -   }
>>> -
>>> -   iommu_group_put(dc->group);
>>> -   }
>>> -
>>> +   host1x_client_iommu_detach(client, dc->group);
>>> host1x_syncpt_free(dc->syncpt);
>>>  
>>> return 0;
>>> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
>>> index 7afe2f635f74..bc1008305e1e 100644
>>> --- a/drivers/gpu/drm/tegra/drm.c
>>> +++ b/drivers/gpu/drm/tegra/drm.c
>>> @@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm 
>>> *tegra,
>>> return 0;
>>>  }
>>>  
>>> +struct iommu_group *host1x_client_iommu_attach(struct host1x_client 
>>> *client,
>>> +  bool shared)
>>> +{
>>> +   struct drm_device *drm = dev_get_drvdata(client->parent);
>>> +   struct tegra_drm *tegra = drm->dev_private;
>>> +   struct iommu_group *group = NULL;
>>> +   int err;
>>> +
>>> +   if (tegra->domain) {
>>> +   group = iommu_group_get(client->dev);
>>> +
>>> +   if (group && (!shared || (shared && (group != tegra->group {
>>> +   err = iommu_attach_group(tegra->domain, group);
>>> +   if (err < 0) {
>>> +   iommu_group_put(group);
>>> +   return ERR_PTR(err);
>>> +   }
>>> +
>>> +   if (shared && !tegra->group)
>>> +   tegra->group = group;
>>> +   }
>>> +   }
>>> +
>>> +   return group;
>>> +}
>>> +
>>> +void host1x_client_iommu_detach(struct host1x_client *client,
>>> +   struct iommu_group *group)
>>> +{
>>> +   struct drm_device *drm = dev_get_drvdata(client->parent);

Re: [PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-05 Thread Dmitry Osipenko 
On 04.05.2018 16:37, Thierry Reding wrote:
> From: Thierry Reding 
> 
> Attaching to and detaching from an IOMMU uses the same code sequence in
> every driver, so factor it out into separate helpers.
> 
> Signed-off-by: Thierry Reding 
> ---
>  drivers/gpu/drm/tegra/dc.c   | 42 ++--
>  drivers/gpu/drm/tegra/drm.c  | 42 
>  drivers/gpu/drm/tegra/drm.h  |  4 
>  drivers/gpu/drm/tegra/gr2d.c | 32 +++
>  drivers/gpu/drm/tegra/gr3d.c | 31 ++
>  5 files changed, 68 insertions(+), 83 deletions(-)
> 
> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> index c843f11043db..3e7ec3937346 100644
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client *client)
>   if (!dc->syncpt)
>   dev_warn(dc->dev, "failed to allocate syncpoint\n");
>  
> - if (tegra->domain) {
> - dc->group = iommu_group_get(client->dev);
> -
> - if (dc->group && dc->group != tegra->group) {
> - err = iommu_attach_group(tegra->domain, dc->group);
> - if (err < 0) {
> - dev_err(dc->dev,
> - "failed to attach to domain: %d\n",
> - err);
> - iommu_group_put(dc->group);
> - return err;
> - }
> -
> - tegra->group = dc->group;
> - }
> + dc->group = host1x_client_iommu_attach(client, true);
> + if (IS_ERR(dc->group)) {
> + err = PTR_ERR(dc->group);
> + dev_err(client->dev, "failed to attach to domain: %d\n", err);
> + return err;
>   }
>  
>   if (dc->soc->wgrps)
> @@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client *client)
>   if (!IS_ERR(primary))
>   drm_plane_cleanup(primary);
>  
> - if (dc->group) {
> - if (dc->group == tegra->group) {
> - iommu_detach_group(tegra->domain, dc->group);
> - tegra->group = NULL;
> - }
> -
> - iommu_group_put(dc->group);
> - }
> -
> + host1x_client_iommu_detach(client, dc->group);
>   host1x_syncpt_free(dc->syncpt);
>  
>   return err;
> @@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client *client)
>  
>  static int tegra_dc_exit(struct host1x_client *client)
>  {
> - struct drm_device *drm = dev_get_drvdata(client->parent);
>   struct tegra_dc *dc = host1x_client_to_dc(client);
> - struct tegra_drm *tegra = drm->dev_private;
>   int err;
>  
>   devm_free_irq(dc->dev, dc->irq, dc);
> @@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client *client)
>   return err;
>   }
>  
> - if (dc->group) {
> - if (dc->group == tegra->group) {
> - iommu_detach_group(tegra->domain, dc->group);
> - tegra->group = NULL;
> - }
> -
> - iommu_group_put(dc->group);
> - }
> -
> + host1x_client_iommu_detach(client, dc->group);
>   host1x_syncpt_free(dc->syncpt);
>  
>   return 0;
> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> index 7afe2f635f74..bc1008305e1e 100644
> --- a/drivers/gpu/drm/tegra/drm.c
> +++ b/drivers/gpu/drm/tegra/drm.c
> @@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm 
> *tegra,
>   return 0;
>  }
>  
> +struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client,
> +bool shared)
> +{
> + struct drm_device *drm = dev_get_drvdata(client->parent);
> + struct tegra_drm *tegra = drm->dev_private;
> + struct iommu_group *group = NULL;
> + int err;
> +
> + if (tegra->domain) {
> + group = iommu_group_get(client->dev);
> +
> + if (group && (!shared || (shared && (group != tegra->group {
> + err = iommu_attach_group(tegra->domain, group);
> + if (err < 0) {
> + iommu_group_put(group);
> + return ERR_PTR(err);
> + }
> +
> + if (shared && !tegra->group)
> + tegra->group = group;
> + }
> + }
> +
> + return group;
> +}
> +
> +void host1x_client_iommu_detach(struct host1x_client *client,
> + struct iommu_group *group)
> +{
> + struct drm_device *drm = dev_get_drvdata(client->parent);
> + struct tegra_drm *tegra = drm->dev_private;
> +
> + if (group) {
> + if (group == tegra->group) {
> + iommu_detach_group(tegra->domain, group);
> + tegra->group = NULL;
> +

Re: [PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-04 Thread Thierry Reding 
On Fri, May 04, 2018 at 06:17:45PM +0300, Dmitry Osipenko wrote:
> On 04.05.2018 18:10, Thierry Reding wrote:
> > On Fri, May 04, 2018 at 05:23:42PM +0300, Dmitry Osipenko wrote:
> >> On 04.05.2018 16:37, Thierry Reding wrote:
> >>> From: Thierry Reding 
> >>>
> >>> Attaching to and detaching from an IOMMU uses the same code sequence in
> >>> every driver, so factor it out into separate helpers.
> >>>
> >>> Signed-off-by: Thierry Reding 
> >>> ---
> >>>  drivers/gpu/drm/tegra/dc.c   | 42 ++--
> >>>  drivers/gpu/drm/tegra/drm.c  | 42 
> >>>  drivers/gpu/drm/tegra/drm.h  |  4 
> >>>  drivers/gpu/drm/tegra/gr2d.c | 32 +++
> >>>  drivers/gpu/drm/tegra/gr3d.c | 31 ++
> >>>  5 files changed, 68 insertions(+), 83 deletions(-)
> >>>
> >>> diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> >>> index c843f11043db..3e7ec3937346 100644
> >>> --- a/drivers/gpu/drm/tegra/dc.c
> >>> +++ b/drivers/gpu/drm/tegra/dc.c
> >>> @@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client 
> >>> *client)
> >>>   if (!dc->syncpt)
> >>>   dev_warn(dc->dev, "failed to allocate syncpoint\n");
> >>>  
> >>> - if (tegra->domain) {
> >>> - dc->group = iommu_group_get(client->dev);
> >>> -
> >>> - if (dc->group && dc->group != tegra->group) {
> >>> - err = iommu_attach_group(tegra->domain, dc->group);
> >>> - if (err < 0) {
> >>> - dev_err(dc->dev,
> >>> - "failed to attach to domain: %d\n",
> >>> - err);
> >>> - iommu_group_put(dc->group);
> >>> - return err;
> >>> - }
> >>> -
> >>> - tegra->group = dc->group;
> >>> - }
> >>> + dc->group = host1x_client_iommu_attach(client, true);
> >>> + if (IS_ERR(dc->group)) {
> >>> + err = PTR_ERR(dc->group);
> >>> + dev_err(client->dev, "failed to attach to domain: %d\n", err);
> >>> + return err;
> >>>   }
> >>>  
> >>>   if (dc->soc->wgrps)
> >>> @@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client 
> >>> *client)
> >>>   if (!IS_ERR(primary))
> >>>   drm_plane_cleanup(primary);
> >>>  
> >>> - if (dc->group) {
> >>> - if (dc->group == tegra->group) {
> >>> - iommu_detach_group(tegra->domain, dc->group);
> >>> - tegra->group = NULL;
> >>> - }
> >>> -
> >>> - iommu_group_put(dc->group);
> >>> - }
> >>> -
> >>> + host1x_client_iommu_detach(client, dc->group);
> >>>   host1x_syncpt_free(dc->syncpt);
> >>>  
> >>>   return err;
> >>> @@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client 
> >>> *client)
> >>>  
> >>>  static int tegra_dc_exit(struct host1x_client *client)
> >>>  {
> >>> - struct drm_device *drm = dev_get_drvdata(client->parent);
> >>>   struct tegra_dc *dc = host1x_client_to_dc(client);
> >>> - struct tegra_drm *tegra = drm->dev_private;
> >>>   int err;
> >>>  
> >>>   devm_free_irq(dc->dev, dc->irq, dc);
> >>> @@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client 
> >>> *client)
> >>>   return err;
> >>>   }
> >>>  
> >>> - if (dc->group) {
> >>> - if (dc->group == tegra->group) {
> >>> - iommu_detach_group(tegra->domain, dc->group);
> >>> - tegra->group = NULL;
> >>> - }
> >>> -
> >>> - iommu_group_put(dc->group);
> >>> - }
> >>> -
> >>> + host1x_client_iommu_detach(client, dc->group);
> >>>   host1x_syncpt_free(dc->syncpt);
> >>>  
> >>>   return 0;
> >>> diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> >>> index 7afe2f635f74..bc1008305e1e 100644
> >>> --- a/drivers/gpu/drm/tegra/drm.c
> >>> +++ b/drivers/gpu/drm/tegra/drm.c
> >>> @@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm 
> >>> *tegra,
> >>>   return 0;
> >>>  }
> >>>  
> >>> +struct iommu_group *host1x_client_iommu_attach(struct host1x_client 
> >>> *client,
> >>> +bool shared)
> >>> +{
> >>> + struct drm_device *drm = dev_get_drvdata(client->parent);
> >>> + struct tegra_drm *tegra = drm->dev_private;
> >>> + struct iommu_group *group = NULL;
> >>> + int err;
> >>> +
> >>> + if (tegra->domain) {
> >>> + group = iommu_group_get(client->dev);
> >>> +
> >>> + if (group && (!shared || (shared && (group != tegra->group {
> >>> + err = iommu_attach_group(tegra->domain, group);
> >>> + if (err < 0) {
> >>> + iommu_group_put(group);
> >>> + return ERR_PTR(err);
> >>> + }
> >>> +
> >>> + if (shared && !tegra->group)
> >>> + tegra->group = group;
> >>> + }
> >>> + }
> >>> +
> >>> + return group;
> >>> +}
> >>> +
> >>

Re: [PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-04 Thread Thierry Reding 
On Fri, May 04, 2018 at 05:23:42PM +0300, Dmitry Osipenko wrote:
> On 04.05.2018 16:37, Thierry Reding wrote:
> > From: Thierry Reding 
> > 
> > Attaching to and detaching from an IOMMU uses the same code sequence in
> > every driver, so factor it out into separate helpers.
> > 
> > Signed-off-by: Thierry Reding 
> > ---
> >  drivers/gpu/drm/tegra/dc.c   | 42 ++--
> >  drivers/gpu/drm/tegra/drm.c  | 42 
> >  drivers/gpu/drm/tegra/drm.h  |  4 
> >  drivers/gpu/drm/tegra/gr2d.c | 32 +++
> >  drivers/gpu/drm/tegra/gr3d.c | 31 ++
> >  5 files changed, 68 insertions(+), 83 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
> > index c843f11043db..3e7ec3937346 100644
> > --- a/drivers/gpu/drm/tegra/dc.c
> > +++ b/drivers/gpu/drm/tegra/dc.c
> > @@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client 
> > *client)
> > if (!dc->syncpt)
> > dev_warn(dc->dev, "failed to allocate syncpoint\n");
> >  
> > -   if (tegra->domain) {
> > -   dc->group = iommu_group_get(client->dev);
> > -
> > -   if (dc->group && dc->group != tegra->group) {
> > -   err = iommu_attach_group(tegra->domain, dc->group);
> > -   if (err < 0) {
> > -   dev_err(dc->dev,
> > -   "failed to attach to domain: %d\n",
> > -   err);
> > -   iommu_group_put(dc->group);
> > -   return err;
> > -   }
> > -
> > -   tegra->group = dc->group;
> > -   }
> > +   dc->group = host1x_client_iommu_attach(client, true);
> > +   if (IS_ERR(dc->group)) {
> > +   err = PTR_ERR(dc->group);
> > +   dev_err(client->dev, "failed to attach to domain: %d\n", err);
> > +   return err;
> > }
> >  
> > if (dc->soc->wgrps)
> > @@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client 
> > *client)
> > if (!IS_ERR(primary))
> > drm_plane_cleanup(primary);
> >  
> > -   if (dc->group) {
> > -   if (dc->group == tegra->group) {
> > -   iommu_detach_group(tegra->domain, dc->group);
> > -   tegra->group = NULL;
> > -   }
> > -
> > -   iommu_group_put(dc->group);
> > -   }
> > -
> > +   host1x_client_iommu_detach(client, dc->group);
> > host1x_syncpt_free(dc->syncpt);
> >  
> > return err;
> > @@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client *client)
> >  
> >  static int tegra_dc_exit(struct host1x_client *client)
> >  {
> > -   struct drm_device *drm = dev_get_drvdata(client->parent);
> > struct tegra_dc *dc = host1x_client_to_dc(client);
> > -   struct tegra_drm *tegra = drm->dev_private;
> > int err;
> >  
> > devm_free_irq(dc->dev, dc->irq, dc);
> > @@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client 
> > *client)
> > return err;
> > }
> >  
> > -   if (dc->group) {
> > -   if (dc->group == tegra->group) {
> > -   iommu_detach_group(tegra->domain, dc->group);
> > -   tegra->group = NULL;
> > -   }
> > -
> > -   iommu_group_put(dc->group);
> > -   }
> > -
> > +   host1x_client_iommu_detach(client, dc->group);
> > host1x_syncpt_free(dc->syncpt);
> >  
> > return 0;
> > diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
> > index 7afe2f635f74..bc1008305e1e 100644
> > --- a/drivers/gpu/drm/tegra/drm.c
> > +++ b/drivers/gpu/drm/tegra/drm.c
> > @@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm 
> > *tegra,
> > return 0;
> >  }
> >  
> > +struct iommu_group *host1x_client_iommu_attach(struct host1x_client 
> > *client,
> > +  bool shared)
> > +{
> > +   struct drm_device *drm = dev_get_drvdata(client->parent);
> > +   struct tegra_drm *tegra = drm->dev_private;
> > +   struct iommu_group *group = NULL;
> > +   int err;
> > +
> > +   if (tegra->domain) {
> > +   group = iommu_group_get(client->dev);
> > +
> > +   if (group && (!shared || (shared && (group != tegra->group {
> > +   err = iommu_attach_group(tegra->domain, group);
> > +   if (err < 0) {
> > +   iommu_group_put(group);
> > +   return ERR_PTR(err);
> > +   }
> > +
> > +   if (shared && !tegra->group)
> > +   tegra->group = group;
> > +   }
> > +   }
> > +
> > +   return group;
> > +}
> > +
> > +void host1x_client_iommu_detach(struct host1x_client *client,
> > +   struct iommu_group *group)
> > +{
> > +   struct drm_device *drm = dev_get_drvdata(client->parent);
> > +   struct tegra_drm *tegra = drm->dev

[PATCH 4/4] drm/tegra: Refactor IOMMU attach/detach

2018-05-04 Thread Thierry Reding 
From: Thierry Reding 

Attaching to and detaching from an IOMMU uses the same code sequence in
every driver, so factor it out into separate helpers.

Signed-off-by: Thierry Reding 
---
 drivers/gpu/drm/tegra/dc.c   | 42 ++--
 drivers/gpu/drm/tegra/drm.c  | 42 
 drivers/gpu/drm/tegra/drm.h  |  4 
 drivers/gpu/drm/tegra/gr2d.c | 32 +++
 drivers/gpu/drm/tegra/gr3d.c | 31 ++
 5 files changed, 68 insertions(+), 83 deletions(-)

diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
index c843f11043db..3e7ec3937346 100644
--- a/drivers/gpu/drm/tegra/dc.c
+++ b/drivers/gpu/drm/tegra/dc.c
@@ -1837,21 +1837,11 @@ static int tegra_dc_init(struct host1x_client *client)
if (!dc->syncpt)
dev_warn(dc->dev, "failed to allocate syncpoint\n");
 
-   if (tegra->domain) {
-   dc->group = iommu_group_get(client->dev);
-
-   if (dc->group && dc->group != tegra->group) {
-   err = iommu_attach_group(tegra->domain, dc->group);
-   if (err < 0) {
-   dev_err(dc->dev,
-   "failed to attach to domain: %d\n",
-   err);
-   iommu_group_put(dc->group);
-   return err;
-   }
-
-   tegra->group = dc->group;
-   }
+   dc->group = host1x_client_iommu_attach(client, true);
+   if (IS_ERR(dc->group)) {
+   err = PTR_ERR(dc->group);
+   dev_err(client->dev, "failed to attach to domain: %d\n", err);
+   return err;
}
 
if (dc->soc->wgrps)
@@ -1916,15 +1906,7 @@ static int tegra_dc_init(struct host1x_client *client)
if (!IS_ERR(primary))
drm_plane_cleanup(primary);
 
-   if (dc->group) {
-   if (dc->group == tegra->group) {
-   iommu_detach_group(tegra->domain, dc->group);
-   tegra->group = NULL;
-   }
-
-   iommu_group_put(dc->group);
-   }
-
+   host1x_client_iommu_detach(client, dc->group);
host1x_syncpt_free(dc->syncpt);
 
return err;
@@ -1932,9 +1914,7 @@ static int tegra_dc_init(struct host1x_client *client)
 
 static int tegra_dc_exit(struct host1x_client *client)
 {
-   struct drm_device *drm = dev_get_drvdata(client->parent);
struct tegra_dc *dc = host1x_client_to_dc(client);
-   struct tegra_drm *tegra = drm->dev_private;
int err;
 
devm_free_irq(dc->dev, dc->irq, dc);
@@ -1945,15 +1925,7 @@ static int tegra_dc_exit(struct host1x_client *client)
return err;
}
 
-   if (dc->group) {
-   if (dc->group == tegra->group) {
-   iommu_detach_group(tegra->domain, dc->group);
-   tegra->group = NULL;
-   }
-
-   iommu_group_put(dc->group);
-   }
-
+   host1x_client_iommu_detach(client, dc->group);
host1x_syncpt_free(dc->syncpt);
 
return 0;
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 7afe2f635f74..bc1008305e1e 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -1114,6 +1114,48 @@ int tegra_drm_unregister_client(struct tegra_drm *tegra,
return 0;
 }
 
+struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client,
+  bool shared)
+{
+   struct drm_device *drm = dev_get_drvdata(client->parent);
+   struct tegra_drm *tegra = drm->dev_private;
+   struct iommu_group *group = NULL;
+   int err;
+
+   if (tegra->domain) {
+   group = iommu_group_get(client->dev);
+
+   if (group && (!shared || (shared && (group != tegra->group {
+   err = iommu_attach_group(tegra->domain, group);
+   if (err < 0) {
+   iommu_group_put(group);
+   return ERR_PTR(err);
+   }
+
+   if (shared && !tegra->group)
+   tegra->group = group;
+   }
+   }
+
+   return group;
+}
+
+void host1x_client_iommu_detach(struct host1x_client *client,
+   struct iommu_group *group)
+{
+   struct drm_device *drm = dev_get_drvdata(client->parent);
+   struct tegra_drm *tegra = drm->dev_private;
+
+   if (group) {
+   if (group == tegra->group) {
+   iommu_detach_group(tegra->domain, group);
+   tegra->group = NULL;
+   }
+
+   iommu_group_put(group);
+   }
+}
+
 void *tegra_drm_alloc(struct tegra_drm *tegra, size_t size, dma_addr_t *dma)
 {
st