brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm-buffer: Clean up file descriptor variable naming

Browse Source 
Nowhere else is it called 'drm_fd' so lets not get rid of this
inconsistency.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/584
This commit is contained in:
Jonas Ådahl 2019-05-20 21:27:34 +02:00 committed by Georges Basile Stavracas Neto
parent 7fb7b28cd6
commit 6eeba2434a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backends/native/meta-drm-buffer.c
View File

@ -78,7 +78,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer,
uint32_t width, height, format; uint32_t width, height, format;
struct gbm_bo *bo; struct gbm_bo *bo;
int i; int i;
int drm_fd; int kms_fd;
g_return_val_if_fail (META_IS_DRM_BUFFER (buffer), FALSE); g_return_val_if_fail (META_IS_DRM_BUFFER (buffer), FALSE);
g_return_val_if_fail (buffer->type == META_DRM_BUFFER_TYPE_GBM, FALSE); g_return_val_if_fail (buffer->type == META_DRM_BUFFER_TYPE_GBM, FALSE);
@ -87,8 +87,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer,
g_return_val_if_fail (buffer->gbm.gpu_kms != NULL, FALSE); g_return_val_if_fail (buffer->gbm.gpu_kms != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
drm_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); kms_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms);
g_return_val_if_fail (drm_fd >= 0, FALSE);
bo = gbm_surface_lock_front_buffer (buffer->gbm.surface); bo = gbm_surface_lock_front_buffer (buffer->gbm.surface);
if (!bo) if (!bo)
@ -125,7 +124,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer,
if (use_modifiers && modifiers[0] != DRM_FORMAT_MOD_INVALID) if (use_modifiers && modifiers[0] != DRM_FORMAT_MOD_INVALID)
{ {
if (drmModeAddFB2WithModifiers (drm_fd, if (drmModeAddFB2WithModifiers (kms_fd,
width, width,
height, height,
format, format,
@ -145,7 +144,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer,
return FALSE; return FALSE;
} }
} }
else if (drmModeAddFB2 (drm_fd, else if (drmModeAddFB2 (kms_fd,
width, width,
height, height,
format, format,
@ -166,7 +165,7 @@ meta_drm_buffer_acquire_swapped_buffer (MetaDrmBuffer *buffer,
return FALSE; return FALSE;
} }
if (drmModeAddFB (drm_fd, if (drmModeAddFB (kms_fd,
width, width,
height, height,
24, 24,
@ -205,8 +204,10 @@ meta_drm_buffer_finalize (GObject *object)
if (buffer->gbm.gpu_kms != NULL && if (buffer->gbm.gpu_kms != NULL &&
buffer->gbm.fb_id != INVALID_FB_ID) buffer->gbm.fb_id != INVALID_FB_ID)
{ {
int drm_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms); int kms_fd;
drmModeRmFB (drm_fd, buffer->fb_id);
kms_fd = meta_gpu_kms_get_fd (buffer->gbm.gpu_kms);
drmModeRmFB (kms_fd, buffer->fb_id);
buffer->fb_id = INVALID_FB_ID; buffer->fb_id = INVALID_FB_ID;
} }