* [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap
@ 2022-10-20 21:33 Dmitry Osipenko
2022-10-23 17:01 ` Dmitry Osipenko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2022-10-20 21:33 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
Christian König, David Airlie, Daniel Vetter
Cc: dri-devel, linux-kernel
The drm_client_buffer_delete() wasn't switched to unlocked GEM vunmapping
by accident when rest of drm_client code transitioned to the unlocked
variants of the vmapping functions. Make drm_client_buffer_delete() use
the unlocked variant. This fixes lockdep warning splat about missing
reservation lock when framebuffer is released.
Reported-by: kernel test robot <yujie.liu@intel.com>
Link: https://lore.kernel.org/dri-devel/890f70db-68b0-8456-ca3c-c5496ef90517@collabora.com/T/
Fixes: 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
drivers/gpu/drm/drm_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index fbcb1e995384..38e1be991caa 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -235,7 +235,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
{
struct drm_device *dev = buffer->client->dev;
- drm_gem_vunmap(buffer->gem, &buffer->map);
+ drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
if (buffer->gem)
drm_gem_object_put(buffer->gem);
--
2.37.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap
2022-10-20 21:33 [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap Dmitry Osipenko
@ 2022-10-23 17:01 ` Dmitry Osipenko
2022-10-24 10:56 ` Christian König
2022-10-24 19:36 ` Dmitry Osipenko
2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2022-10-23 17:01 UTC (permalink / raw)
To: Christian König
Cc: dri-devel, linux-kernel, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Daniel Vetter
Hello,
On 10/21/22 00:33, Dmitry Osipenko wrote:
> The drm_client_buffer_delete() wasn't switched to unlocked GEM vunmapping
> by accident when rest of drm_client code transitioned to the unlocked
> variants of the vmapping functions. Make drm_client_buffer_delete() use
> the unlocked variant. This fixes lockdep warning splat about missing
> reservation lock when framebuffer is released.
>
> Reported-by: kernel test robot <yujie.liu@intel.com>
> Link: https://lore.kernel.org/dri-devel/890f70db-68b0-8456-ca3c-c5496ef90517@collabora.com/T/
> Fixes: 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index fbcb1e995384..38e1be991caa 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -235,7 +235,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
> {
> struct drm_device *dev = buffer->client->dev;
>
> - drm_gem_vunmap(buffer->gem, &buffer->map);
> + drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
>
> if (buffer->gem)
> drm_gem_object_put(buffer->gem);
Christian, could you please give yours r-b? The dim insists that the
patch should have r-b or it won't let me push to misc-next. Thanks in
advance!
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap
2022-10-20 21:33 [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap Dmitry Osipenko
2022-10-23 17:01 ` Dmitry Osipenko
@ 2022-10-24 10:56 ` Christian König
2022-10-24 19:36 ` Dmitry Osipenko
2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2022-10-24 10:56 UTC (permalink / raw)
To: Dmitry Osipenko, Maarten Lankhorst, Maxime Ripard,
Thomas Zimmermann, David Airlie, Daniel Vetter
Cc: dri-devel, linux-kernel
Am 20.10.22 um 23:33 schrieb Dmitry Osipenko:
> The drm_client_buffer_delete() wasn't switched to unlocked GEM vunmapping
> by accident when rest of drm_client code transitioned to the unlocked
> variants of the vmapping functions. Make drm_client_buffer_delete() use
> the unlocked variant. This fixes lockdep warning splat about missing
> reservation lock when framebuffer is released.
>
> Reported-by: kernel test robot <yujie.liu@intel.com>
> Link: https://lore.kernel.org/dri-devel/890f70db-68b0-8456-ca3c-c5496ef90517@collabora.com/T/
> Fixes: 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
The code was properly added recently between review and pushing. Let's
get that upstream ASAP.
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index fbcb1e995384..38e1be991caa 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -235,7 +235,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
> {
> struct drm_device *dev = buffer->client->dev;
>
> - drm_gem_vunmap(buffer->gem, &buffer->map);
> + drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
>
> if (buffer->gem)
> drm_gem_object_put(buffer->gem);
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap
2022-10-20 21:33 [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap Dmitry Osipenko
2022-10-23 17:01 ` Dmitry Osipenko
2022-10-24 10:56 ` Christian König
@ 2022-10-24 19:36 ` Dmitry Osipenko
2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2022-10-24 19:36 UTC (permalink / raw)
To: Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann,
Christian König, David Airlie, Daniel Vetter
Cc: dri-devel, linux-kernel
On 10/21/22 00:33, Dmitry Osipenko wrote:
> The drm_client_buffer_delete() wasn't switched to unlocked GEM vunmapping
> by accident when rest of drm_client code transitioned to the unlocked
> variants of the vmapping functions. Make drm_client_buffer_delete() use
> the unlocked variant. This fixes lockdep warning splat about missing
> reservation lock when framebuffer is released.
>
> Reported-by: kernel test robot <yujie.liu@intel.com>
> Link: https://lore.kernel.org/dri-devel/890f70db-68b0-8456-ca3c-c5496ef90517@collabora.com/T/
> Fixes: 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> ---
> drivers/gpu/drm/drm_client.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
> index fbcb1e995384..38e1be991caa 100644
> --- a/drivers/gpu/drm/drm_client.c
> +++ b/drivers/gpu/drm/drm_client.c
> @@ -235,7 +235,7 @@ static void drm_client_buffer_delete(struct drm_client_buffer *buffer)
> {
> struct drm_device *dev = buffer->client->dev;
>
> - drm_gem_vunmap(buffer->gem, &buffer->map);
> + drm_gem_vunmap_unlocked(buffer->gem, &buffer->map);
>
> if (buffer->gem)
> drm_gem_object_put(buffer->gem);
Applied to misc-next
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-24 21:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-20 21:33 [PATCH v1] drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap Dmitry Osipenko
2022-10-23 17:01 ` Dmitry Osipenko
2022-10-24 10:56 ` Christian König
2022-10-24 19:36 ` Dmitry Osipenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).