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

lib/igt_kms: add kmstest_get_crtc_idx

Browse Source 
Move it from pm_rpm.c to lib/igt_kms and remove the hardcoded version
from kms_frontbuffer_tracking. I'm also planning to add other callers.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
This commit is contained in:
Paulo Zanoni 2016-02-26 08:54:57 -03:00
parent b6b130c5eb
commit c6279ec4bb
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/igt_kms.c
View File

@ -875,6 +875,24 @@ void kmstest_unset_all_crtcs(int drm_fd, drmModeResPtr resources)
} }
} }
/**
* kmstest_get_crtc_idx: get the CRTC index based on its ID
* @res: the libdrm resources
* @crtc_id: the CRTC id
*
* This is useful since a few places of libdrm deal with CRTC masks.
*/
int kmstest_get_crtc_idx(drmModeRes *res, uint32_t crtc_id)
{
int i;
for (i = 0; i < res->count_crtcs; i++)
if (res->crtcs[i] == crtc_id)
return i;
igt_assert(false);
}
/* /*
* A small modeset API * A small modeset API
*/ */

1
lib/igt_kms.h
View File

@ -150,6 +150,7 @@ bool kmstest_get_property(int drm_fd, uint32_t object_id, uint32_t object_type,
const char *name, uint32_t *prop_id, uint64_t *value, const char *name, uint32_t *prop_id, uint64_t *value,
drmModePropertyPtr *prop); drmModePropertyPtr *prop);
void kmstest_unset_all_crtcs(int drm_fd, drmModeResPtr resources); void kmstest_unset_all_crtcs(int drm_fd, drmModeResPtr resources);
int kmstest_get_crtc_idx(drmModeRes *res, uint32_t crtc_id);
/* /*
* A small modeset API * A small modeset API

10
tests/kms_frontbuffer_tracking.c
View File

@ -2212,16 +2212,12 @@ static void wait_flip_event(void)
static void set_prim_plane_for_params(struct modeset_params *params) static void set_prim_plane_for_params(struct modeset_params *params)
{ {
int rc, i, crtc_index = -1; int rc, i;
int crtc_idx = kmstest_get_crtc_idx(drm.res, params->crtc_id);
uint32_t plane_id = 0; uint32_t plane_id = 0;
for (i = 0; i < drm.res->count_crtcs; i++)
if (drm.res->crtcs[i] == params->crtc_id)
crtc_index = i;
igt_assert(crtc_index >= 0);
for (i = 0; i < drm.plane_res->count_planes; i++) for (i = 0; i < drm.plane_res->count_planes; i++)
if ((drm.planes[i]->possible_crtcs & (1 << crtc_index)) && if ((drm.planes[i]->possible_crtcs & (1 << crtc_idx)) &&
drm.plane_types[i] == DRM_PLANE_TYPE_PRIMARY) drm.plane_types[i] == DRM_PLANE_TYPE_PRIMARY)
plane_id = drm.planes[i]->plane_id; plane_id = drm.planes[i]->plane_id;
igt_assert(plane_id); igt_assert(plane_id);

14
tests/pm_rpm.c
View File

@ -1681,17 +1681,6 @@ static void test_one_plane(bool dpms, uint32_t plane_id,
igt_assert(wait_for_suspended()); igt_assert(wait_for_suspended());
} }
static int get_crtc_idx(drmModeResPtr res, uint32_t crtc_id)
{
int i;
for (i = 0; i < res->count_crtcs; i++)
if (res->crtcs[i] == crtc_id)
return i;
igt_assert(false);
}
/* This one also triggered WARNs on our driver at some point in time. */ /* This one also triggered WARNs on our driver at some point in time. */
static void planes_subtest(bool universal, bool dpms) static void planes_subtest(bool universal, bool dpms)
{ {
@ -1699,7 +1688,8 @@ static void planes_subtest(bool universal, bool dpms)
drmModePlaneResPtr planes; drmModePlaneResPtr planes;
igt_require(default_mode_params); igt_require(default_mode_params);
crtc_idx = get_crtc_idx(ms_data.res, default_mode_params->crtc_id); crtc_idx = kmstest_get_crtc_idx(ms_data.res,
default_mode_params->crtc_id);
if (universal) { if (universal) {
rc = drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, rc = drmSetClientCap(drm_fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES,