flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-19 13:56:23 +00:00
Code Issues Releases Wiki Activity

igt_kms: optionally return the property from get_property

Browse Source 
So we can use this function on places that also need the property
pointer, without having to call drmModeGetProperty() again with the
returned id.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2014-08-06 12:03:57 -03:00
parent 18d8ea7fe4
commit 053c104322
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/igt_kms.c
View File

@ -595,42 +595,46 @@ static void igt_output_refresh(igt_output_t *output)
static bool static bool
get_property(int drm_fd, uint32_t object_id, uint32_t object_type, get_property(int drm_fd, uint32_t object_id, uint32_t object_type,
const char *name, uint32_t *prop_id /* out */, const char *name, uint32_t *prop_id /* out */,
uint64_t *value /* out */) uint64_t *value /* out */, drmModePropertyPtr *prop /* out */)
{ {
drmModeObjectPropertiesPtr proplist; drmModeObjectPropertiesPtr proplist;
drmModePropertyPtr prop = NULL; drmModePropertyPtr _prop;
bool found = false; bool found = false;
int i; int i;
proplist = drmModeObjectGetProperties(drm_fd, object_id, object_type); proplist = drmModeObjectGetProperties(drm_fd, object_id, object_type);
for (i = 0; i < proplist->count_props; i++) { for (i = 0; i < proplist->count_props; i++) {
drmModeFreeProperty(prop); _prop = drmModeGetProperty(drm_fd, proplist->props[i]);
prop = drmModeGetProperty(drm_fd, proplist->props[i]); if (!_prop)
if (!prop)
continue; continue;
if (strcmp(prop->name, name) == 0) { if (strcmp(_prop->name, name) == 0) {
found = true; found = true;
if (prop_id) if (prop_id)
*prop_id = proplist->props[i]; *prop_id = proplist->props[i];
if (value) if (value)
*value = proplist->prop_values[i]; *value = proplist->prop_values[i];
goto out; if (prop)
*prop = _prop;
else
drmModeFreeProperty(_prop);
break;
} }
drmModeFreeProperty(_prop);
} }
out:
drmModeFreeProperty(prop);
drmModeFreeObjectProperties(proplist); drmModeFreeObjectProperties(proplist);
return found; return found;
} }
static bool static bool
get_plane_property(int drm_fd, uint32_t plane_id, const char *name, get_plane_property(int drm_fd, uint32_t plane_id, const char *name,
uint32_t *prop_id /* out */, uint64_t *value /* out */) uint32_t *prop_id /* out */, uint64_t *value /* out */,
drmModePropertyPtr *prop /* out */)
{ {
return get_property(drm_fd, plane_id, DRM_MODE_OBJECT_PLANE, return get_property(drm_fd, plane_id, DRM_MODE_OBJECT_PLANE,
name, prop_id, value); name, prop_id, value, prop);
} }
static void static void
@ -654,7 +658,7 @@ static int get_drm_plane_type(int drm_fd, uint32_t plane_id)
bool has_prop; bool has_prop;
has_prop = get_plane_property(drm_fd, plane_id, "type", has_prop = get_plane_property(drm_fd, plane_id, "type",
NULL /* prop_id */, &value); NULL /* prop_id */, &value, NULL);
if (has_prop) if (has_prop)
return (int)value; return (int)value;
@ -743,7 +747,8 @@ void igt_display_init(igt_display_t *display, int drm_fd)
get_plane_property(display->drm_fd, drm_plane->plane_id, get_plane_property(display->drm_fd, drm_plane->plane_id,
"rotation", "rotation",
&plane->rotation_property, &plane->rotation_property,
&prop_value); &prop_value,
NULL);
plane->rotation = (igt_rotation_t)prop_value; plane->rotation = (igt_rotation_t)prop_value;
} }