Skip to contentSkip to conversation

drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap

PATCH Applied Dmitry Osipenko 2 participants 4 messages Oct 20, 2022 – Oct 24, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm: Switch drm_client_buffer_delete() to unlocked drm_gem_vunmap

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.

Fixes 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
---
 drivers/gpu/drm/drm_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_client.c +1 -1
index fbcb1e995384..38e1be991caa 100644
@@ -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);
Signature · 1 line
2.37.3
#1 lore raw

Hello,

Quoted 19 lines · 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.

Fixes 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
---
 drivers/gpu/drm/drm_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_client.c +0 -0
index fbcb1e995384..38e1be991caa 100644

drivers/gpu/drm/drm_client.c static void drm_client_buffer_delete(struct drm_client_buffer *buffer) · line 241

Quoted 8 lines
drivers/gpu/drm/drm_client.c +1 -1
@@ -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!

Signature · 2 lines
Best regards,
Dmitry
Acked-by on v1 1/1
#2 lore raw
In reply to Dmitry Osipenko

Am 20.10.22 um 23:33 schrieb Dmitry Osipenko:

Quoted 10 lines

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.

Fixes 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")

The code was properly added recently between review and pushing. Let's get that upstream ASAP.

Quoted 17 lines
---
  drivers/gpu/drm/drm_client.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_client.c +1 -1
index fbcb1e995384..38e1be991caa 100644
@@ -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);
author Applied
#3 lore raw
In reply to Dmitry Osipenko
Quoted 19 lines · 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.

Fixes 79e2cf2e7a19 ("drm/gem: Take reservation lock for vmap/vunmap operations")
---
 drivers/gpu/drm/drm_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/drm_client.c +0 -0
index fbcb1e995384..38e1be991caa 100644

drivers/gpu/drm/drm_client.c static void drm_client_buffer_delete(struct drm_client_buffer *buffer) · line 241

Quoted 8 lines
drivers/gpu/drm/drm_client.c +1 -1
@@ -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

Signature · 2 lines
Best regards,
Dmitry