AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbm: rename gbm_dri_bo_{map,unmap} to gbm_dri_bo_{map,unmap}_dumb

Browse Source 
In preparation to add public map/unmap functions, rename the existing
gbm_dri_bo_{map,unmap} functions to indicate that they are only for dumb
buffers.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
This commit is contained in:
Rob Herring
2016-05-16 21:14:21 -05:00
committed by Emil Velikov
parent e8431a630d
commit 0a4275b534
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egl/drivers/dri2/platform_drm.c
+4 -4
View File
@@ -534,7 +534,7 @@ swrast_put_image2(__DRIdrawable *driDrawable,
return;
bo = gbm_dri_bo(dri2_surf->current->bo);
if (gbm_dri_bo_map(bo) == NULL)
if (gbm_dri_bo_map_dumb(bo) == NULL)
return;
internal_stride = bo->base.base.stride;
@@ -544,7 +544,7 @@ swrast_put_image2(__DRIdrawable *driDrawable,
data + i * stride, stride);
}
gbm_dri_bo_unmap(bo);
gbm_dri_bo_unmap_dumb(bo);
}
static void
@@ -564,7 +564,7 @@ swrast_get_image(__DRIdrawable *driDrawable,
return;
bo = gbm_dri_bo(dri2_surf->current->bo);
if (gbm_dri_bo_map(bo) == NULL)
if (gbm_dri_bo_map_dumb(bo) == NULL)
return;
internal_stride = bo->base.base.stride;
@@ -575,7 +575,7 @@ swrast_get_image(__DRIdrawable *driDrawable,
bo->map + (x + i) * internal_stride + y, stride);
}
gbm_dri_bo_unmap(bo);
gbm_dri_bo_unmap_dumb(bo);
}
static struct dri2_egl_display_vtbl dri2_drm_display_vtbl = {
src/gbm/backends/dri/gbm_dri.c
+2 -2
View File
@@ -603,7 +603,7 @@ gbm_dri_bo_destroy(struct gbm_bo *_bo)
if (bo->image != NULL) {
dri->image->destroyImage(bo->image);
} else {
gbm_dri_bo_unmap(bo);
gbm_dri_bo_unmap_dumb(bo);
memset(&arg, 0, sizeof(arg));
arg.handle = bo->handle;
drmIoctl(dri->base.base.fd, DRM_IOCTL_MODE_DESTROY_DUMB, &arg);
@@ -828,7 +828,7 @@ create_dumb(struct gbm_device *gbm,
bo->handle = create_arg.handle;
bo->size = create_arg.size;
if (gbm_dri_bo_map(bo) == NULL)
if (gbm_dri_bo_map_dumb(bo) == NULL)
goto destroy_dumb;
return &bo->base.base;
src/gbm/backends/dri/gbm_driint.h
+2 -2
View File
@@ -130,7 +130,7 @@ gbm_dri_surface(struct gbm_surface *surface)
}
static inline void *
gbm_dri_bo_map(struct gbm_dri_bo *bo)
gbm_dri_bo_map_dumb(struct gbm_dri_bo *bo)
{
struct drm_mode_map_dumb map_arg;
int ret;
@@ -159,7 +159,7 @@ gbm_dri_bo_map(struct gbm_dri_bo *bo)
}
static inline void
gbm_dri_bo_unmap(struct gbm_dri_bo *bo)
gbm_dri_bo_unmap_dumb(struct gbm_dri_bo *bo)
{
munmap(bo->map, bo->size);
bo->map = NULL;