commit 6d4098e3227467c6e90005d76321c0ccd787b547
author Miguel Casas <mcasas@chromium.org> Thu Apr 08 16:39:51 2021
committer Commit Bot <commit-bot@chromium.org> Fri Apr 09 00:40:37 2021
tree 2382fa7986c74bd89bf597e1a714e9b95545cb82
parent dcfae1d06aeeba4dce45b5a46ec8edb700e9a6ae

s/gbm_bo_get_plane_fd/gbm_bo_get_fd_for_plane/

This CL follows up on a comment in crrev/c/2808787 and updates one
of the gbm function names.

BUG=b:183760490
TEST=emerge && deploy on volteer

Change-Id: I74db64c7bcb153c47910282413b9b47656ca30e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/drm-tests/+/2815599
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Commit-Queue: Miguel Casas <mcasas@chromium.org>
Tested-by: Miguel Casas <mcasas@chromium.org>

bsdrm/src/egl.c

diff --git a/bsdrm/src/egl.c b/bsdrm/src/egl.c
index 7a82270..1f4d77d 100644
--- a/bsdrm/src/egl.c
+++ b/bsdrm/src/egl.c
@@ -255,7 +255,7 @@
 
 	int fds[GBM_MAX_PLANES];
 	for (size_t plane = 0; plane < gbm_bo_get_plane_count(bo); plane++) {
-		fds[plane] = gbm_bo_get_plane_fd(bo, plane);
+		fds[plane] = gbm_bo_get_fd_for_plane(bo, plane);
 		if (fds[plane] < 0) {
 			bs_debug_error("failed to get fb for bo: %d", fds[plane]);
 			return EGL_NO_IMAGE_KHR;

bsdrm/src/mmap.c

diff --git a/bsdrm/src/mmap.c b/bsdrm/src/mmap.c
index 04c785e..a148991 100644
--- a/bsdrm/src/mmap.c
+++ b/bsdrm/src/mmap.c
@@ -39,7 +39,7 @@
 static void *dma_buf_map(struct bs_mapper *mapper, struct gbm_bo *bo, size_t plane,
 			 struct bs_map_info *info, uint32_t *stride)
 {
-	int drm_prime_fd = gbm_bo_get_plane_fd(bo, plane);
+	int drm_prime_fd = gbm_bo_get_fd_for_plane(bo, plane);
 	uint32_t handle = gbm_bo_get_handle_for_plane(bo, plane).u32;
 	size_t length = 0;
 
@@ -71,7 +71,7 @@
 {
 	struct dma_buf_sync sync_end = { 0 };
 	sync_end.flags = DMA_BUF_SYNC_END | DMA_BUF_SYNC_RW;
-	int drm_prime_fd = gbm_bo_get_plane_fd(bo, info->plane_index);
+	int drm_prime_fd = gbm_bo_get_fd_for_plane(bo, info->plane_index);
 	int ret = HANDLE_EINTR(ioctl(drm_prime_fd, DMA_BUF_IOCTL_SYNC, &sync_end));
 	close(drm_prime_fd);
 	if (ret)

mapped_access_perf_test.c

diff --git a/mapped_access_perf_test.c b/mapped_access_perf_test.c
index 8bb275d..8f8ae43 100644
--- a/mapped_access_perf_test.c
+++ b/mapped_access_perf_test.c
@@ -283,7 +283,7 @@
       }
 
       for (size_t plane = 0; plane < NUM_PLANES; plane++) {
-        gbm_bo_fds[plane][j] = gbm_bo_get_plane_fd(bos[j], plane);
+        gbm_bo_fds[plane][j] = gbm_bo_get_fd_for_plane(bos[j], plane);
         if (gbm_bo_fds[plane][j] < 0) {
           bs_debug_error("failed to get BO fd");
           return EXIT_FAILURE;

v4l2_stateful_decoder.c

diff --git a/v4l2_stateful_decoder.c b/v4l2_stateful_decoder.c
index 3f53887..3b33ff9 100644
--- a/v4l2_stateful_decoder.c
+++ b/v4l2_stateful_decoder.c
@@ -320,7 +320,7 @@
   struct gbm_bo* bo = queue->buffers[index].bo;
   for (uint32_t i = 0; i < queue->num_planes; ++i) {
     if (queue->memory == V4L2_MEMORY_DMABUF) {
-      v4l2_buffer.m.planes[i].m.fd = gbm_bo_get_plane_fd(bo, i);
+      v4l2_buffer.m.planes[i].m.fd = gbm_bo_get_fd_for_plane(bo, i);
     } else if (queue->memory == V4L2_MEMORY_MMAP) {
       struct mmap_buffers* buffers = queue->buffers;