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

tests/testdisplay.c: rewite function dump_connectors and dump_crtcs.

Browse Source 
Replace the globe variable drm_fd with local variable passed from parameter.

Signed-off-by: Yi Sun <yi.sun@intel.com>
[danvet: fixup whitespace]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Yi Sun 2012-02-03 22:45:39 +08:00 committed by Daniel Vetter
parent 4cceae74e3
commit 3d46ca8c4d
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
tests/testdisplay.c
View File

@ -176,19 +176,28 @@ static void dump_mode(drmModeModeInfo *mode)
mode->clock); mode->clock);
} }
static void dump_connectors(void)
static void dump_connectors_fd(int drmfd)
{ {
int i, j; int i, j;
drmModeRes *mode_resources = drmModeGetResources(drmfd);
if (!mode_resources) {
fprintf(stderr, "drmModeGetResources failed: %s\n",
strerror(errno));
return;
}
printf("Connectors:\n"); printf("Connectors:\n");
printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\n"); printf("id\tencoder\tstatus\t\ttype\tsize (mm)\tmodes\n");
for (i = 0; i < resources->count_connectors; i++) { for (i = 0; i < mode_resources->count_connectors; i++) {
drmModeConnector *connector; drmModeConnector *connector;
connector = drmModeGetConnector(drm_fd, resources->connectors[i]); connector = drmModeGetConnector(drmfd, mode_resources->connectors[i]);
if (!connector) { if (!connector) {
fprintf(stderr, "could not get connector %i: %s\n", fprintf(stderr, "could not get connector %i: %s\n",
resources->connectors[i], strerror(errno)); mode_resources->connectors[i], strerror(errno));
continue; continue;
} }
@ -212,21 +221,24 @@ static void dump_connectors(void)
drmModeFreeConnector(connector); drmModeFreeConnector(connector);
} }
printf("\n"); printf("\n");
drmModeFreeResources(mode_resources);
} }
static void dump_crtcs(void) static void dump_crtcs_fd(int drmfd)
{ {
int i; int i;
drmModeRes *mode_resources = drmModeGetResources(drmfd);
printf("CRTCs:\n"); printf("CRTCs:\n");
printf("id\tfb\tpos\tsize\n"); printf("id\tfb\tpos\tsize\n");
for (i = 0; i < resources->count_crtcs; i++) { for (i = 0; i < mode_resources->count_crtcs; i++) {
drmModeCrtc *crtc; drmModeCrtc *crtc;
crtc = drmModeGetCrtc(drm_fd, resources->crtcs[i]); crtc = drmModeGetCrtc(drmfd, mode_resources->crtcs[i]);
if (!crtc) { if (!crtc) {
fprintf(stderr, "could not get crtc %i: %s\n", fprintf(stderr, "could not get crtc %i: %s\n",
resources->crtcs[i], strerror(errno)); mode_resources->crtcs[i], strerror(errno));
continue; continue;
} }
printf("%d\t%d\t(%d,%d)\t(%dx%d)\n", printf("%d\t%d\t(%d,%d)\t(%dx%d)\n",
@ -239,8 +251,11 @@ static void dump_crtcs(void)
drmModeFreeCrtc(crtc); drmModeFreeCrtc(crtc);
} }
printf("\n"); printf("\n");
drmModeFreeResources(mode_resources);
} }
#ifdef TEST_PLANES #ifdef TEST_PLANES
static void dump_planes(void) static void dump_planes(void)
{ {
@ -250,7 +265,7 @@ static void dump_planes(void)
plane_resources = drmModeGetPlaneResources(drm_fd); plane_resources = drmModeGetPlaneResources(drm_fd);
if (!plane_resources) { if (!plane_resources) {
fprintf(stderr, "drmModeGetPlaneResources failed: %s\n", fprintf(stderr, "drmModeGetPlaneResources dump failed: %s\n",
strerror(errno)); strerror(errno));
return; return;
} }
@ -974,8 +989,8 @@ int update_display(void)
return 0; return 0;
if (dump_info) { if (dump_info) {
dump_connectors(); dump_connectors_fd(drm_fd);
dump_crtcs(); dump_crtcs_fd(drm_fd);
dump_planes(); dump_planes();
} }