Skip to contentSkip to conversation

drm/vkms: Fix vmap_count increment position

PATCH In review Haneen Mohammed 2 participants 3 messages Aug 1, 2018 – Aug 8, 2018

Subsystems (3)
lore
Share & tools
lore

Haneen Mohammed

author reviewer
#0 lore raw

PATCH 1/1 drm/vkms: Fix vmap_count increment position

Move vmap_count out of the conditional statement since it needs to be updated for every successful call to vkms_gem_vmap.

---
 drivers/gpu/drm/vkms/vkms_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_gem.c +1 -2
index a52e88338c05..5c51dfde7c1e 100644
@@ -240,10 +240,9 @@ int vkms_gem_vmap(struct drm_gem_object *obj)
 		vkms_obj->vaddr = vmap(pages, n_pages, VM_MAP, PAGE_KERNEL);
 		if (!vkms_obj->vaddr)
 			goto err_vmap;
-
-		vkms_obj->vmap_count++;
 	}
 
+	vkms_obj->vmap_count++;
 	goto out;
 
 err_vmap:
Signature · 6 lines
2.17.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
author reviewer
#1 lore raw
Quoted 27 lines · Haneen Mohammed

Move vmap_count out of the conditional statement since it needs to be updated for every successful call to vkms_gem_vmap.

---
 drivers/gpu/drm/vkms/vkms_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_gem.c +1 -2
index a52e88338c05..5c51dfde7c1e 100644
@@ -240,10 +240,9 @@ int vkms_gem_vmap(struct drm_gem_object *obj)
 		vkms_obj->vaddr = vmap(pages, n_pages, VM_MAP, PAGE_KERNEL);
 		if (!vkms_obj->vaddr)
 			goto err_vmap;
-
-		vkms_obj->vmap_count++;
 	}
 
+	vkms_obj->vmap_count++;
 	goto out;
 
 err_vmap:
Signature · 1 line
2.17.1

Hi Sean,

This is a fix to bb112b14af8d ("drm/vkms: Add functions to map/unmap GEM backing storage"), should I add this to the commit message?

Thank you,
Haneen
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 31 lines · Haneen Mohammed
Quoted 27 lines · Haneen Mohammed

Move vmap_count out of the conditional statement since it needs to be updated for every successful call to vkms_gem_vmap.

---
 drivers/gpu/drm/vkms/vkms_gem.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_gem.c +1 -2
index a52e88338c05..5c51dfde7c1e 100644
@@ -240,10 +240,9 @@ int vkms_gem_vmap(struct drm_gem_object *obj)
 		vkms_obj->vaddr = vmap(pages, n_pages, VM_MAP, PAGE_KERNEL);
 		if (!vkms_obj->vaddr)
 			goto err_vmap;
-
-		vkms_obj->vmap_count++;
 	}
 
+	vkms_obj->vmap_count++;
 	goto out;
 
 err_vmap:
Signature · 1 line
2.17.1

Hi Sean,

Quoted 2 lines

This is a fix to bb112b14af8d ("drm/vkms: Add functions to map/unmap GEM backing storage"), should I add this to the commit message?

Yup, usually we include that in a Fixes: tag at the bottom. I've done that while applying, thanks for your patch.

Cheers, Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel