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

kms_rotation_crc: Use drm_plane from igt_plane_t

Browse Source 
So we don't need all that extra code to grab the drm_plane structure for
the primary_plane.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2014-07-08 17:49:03 +01:00
parent 7e7c625441
commit 7ae5d9b347
1 changed files with 3 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tests/kms_rotation_crc.c
View File

@ -52,7 +52,6 @@
#define DRM_PLANE_TYPE_OVERLAY 0
#define DRM_PLANE_TYPE_PRIMARY 1
#define DRM_PLANE_TYPE_CURSOR 2
#define DRM_CLIENT_CAP_EXPOSE_PRIMARY_PLANES 2
typedef struct {
int gfx_fd;
@ -156,67 +155,6 @@ static bool prepare_crtc(data_t *data)
return true;
}
static bool check_plane_type(int drm_fd, uint32_t plane_id, uint32_t type)
{
int i = 0;
drmModeObjectPropertiesPtr props = NULL;
props = drmModeObjectGetProperties(drm_fd, plane_id, DRM_MODE_OBJECT_PLANE);
for (i = 0; i < props->count_props; i++) {
drmModePropertyPtr prop = drmModeGetProperty(drm_fd, props->props[i]);
if (strcmp(prop->name, "type") == 0) {
if (props->prop_values[i] == type)
return true;
igt_info("Didn't find the requested type:%u\n", (unsigned int)props->prop_values[i]);
}
}
return false;
}
static int connector_find_plane(int gfx_fd, uint32_t pipe, uint32_t type)
{
drmModePlaneRes *plane_resources;
drmModePlane *ovr;
uint32_t id = 0;
int i, ret = 0;
ret = drmSetClientCap(gfx_fd, DRM_CLIENT_CAP_EXPOSE_PRIMARY_PLANES, 1);
if (ret < 0) {
igt_info("Failed to set client cap:%d\n", ret);
return 0;
}
plane_resources = drmModeGetPlaneResources(gfx_fd);
if (!plane_resources) {
igt_info("drmModeGetPlaneResources failed: %s\n",
strerror(errno));
return 0;
}
for (i = 0; i < plane_resources->count_planes; i++) {
ovr = drmModeGetPlane(gfx_fd, plane_resources->planes[i]);
if (!ovr) {
igt_info("drmModeGetPlane failed: %s\n",
strerror(errno));
continue;
}
if (ovr->possible_crtcs & (1 << pipe)) {
id = ovr->plane_id;
if (check_plane_type(gfx_fd, id, type)) {
drmModeFreePlane(ovr);
return id;
}
}
drmModeFreePlane(ovr);
}
return 0;
}
static int set_plane_property(data_t *data, int plane_id, const char *prop_name, int
val, igt_crc_t *crc_output)
{
@ -321,6 +259,7 @@ static void test_primary_rotation(data_t *data)
{
igt_display_t *display = &data->display;
igt_output_t *output;
igt_plane_t *primary;
int p;
int plane_id;
int ret;
@ -340,11 +279,8 @@ static void test_primary_rotation(data_t *data)
continue;
sleep(2);
/* Find primary plane. Currently igt_plane_t returned from
* igt_output_get_plane has NULL drm_plane which is needed to get
* the plane_id. So finding the primary plane by checking the "type"
* property of the plane */
plane_id = connector_find_plane(data->gfx_fd, data->pipe, data->type);
primary = igt_output_get_plane(output, IGT_PLANE_PRIMARY);
plane_id = primary->drm_plane->plane_id;
if (plane_id != 0) {
igt_info("Setting rotation property for plane:%d\n", plane_id);
ret = set_plane_property(data, plane_id, "rotation", BIT(data->rotate), &crc_output);