flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-11 16:32:58 +00:00
Code Issues Releases Wiki Activity

lib/igt_kms: Unify pipe name helpers

Browse Source 
And add api doc while at it.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2014-08-12 11:00:37 +02:00
parent fb38cf260b
commit dd8fba44cd
11 changed files with 80 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/igt_debugfs.c
+4 -4
View File
@@ -294,7 +294,7 @@ static bool igt_pipe_crc_do_start(igt_pipe_crc_t *pipe_crc)
{
char buf[64];
sprintf(buf, "pipe %c %s", pipe_name(pipe_crc->pipe),
sprintf(buf, "pipe %s %s", kmstest_pipe_name(pipe_crc->pipe),
pipe_crc_source_name(pipe_crc->source));
errno = 0;
write(pipe_crc->ctl_fd, buf, strlen(buf));
@@ -308,7 +308,7 @@ static void igt_pipe_crc_pipe_off(int fd, enum pipe pipe)
{
char buf[32];
sprintf(buf, "pipe %c none", pipe_name(pipe));
sprintf(buf, "pipe %s none", kmstest_pipe_name(pipe));
write(fd, buf, strlen(buf));
}
@@ -379,7 +379,7 @@ igt_pipe_crc_new(enum pipe pipe, enum intel_pipe_crc_source source)
pipe_crc->ctl_fd = igt_debugfs_open("i915_display_crc_ctl", O_WRONLY);
igt_assert(pipe_crc->ctl_fd != -1);
sprintf(buf, "i915_pipe_%c_crc", pipe_name(pipe));
sprintf(buf, "i915_pipe_%s_crc", kmstest_pipe_name(pipe));
pipe_crc->crc_fd = igt_debugfs_open(buf, O_RDONLY);
igt_assert(pipe_crc->crc_fd != -1);
@@ -445,7 +445,7 @@ void igt_pipe_crc_stop(igt_pipe_crc_t *pipe_crc)
{
char buf[32];
sprintf(buf, "pipe %c none", pipe_name(pipe_crc->pipe));
sprintf(buf, "pipe %s none", kmstest_pipe_name(pipe_crc->pipe));
write(pipe_crc->ctl_fd, buf, strlen(buf));
}
lib/igt_kms.c
+35 -26
View File
@@ -70,7 +70,14 @@
* Note that this library's header pulls in the [i-g-t framebuffer](intel-gpu-tools-i-g-t-framebuffer.html)
* library as a dependency.
*/
const char *kmstest_pipe_str(int pipe)
/**
* kmstest_pipe_name:
* @pipe: display pipe
*
* Returns: String represnting @pipe, e.g. "A".
*/
const char *kmstest_pipe_name(enum pipe pipe)
{
const char *str[] = { "A", "B", "C" };
@@ -586,8 +593,8 @@ static void igt_output_refresh(igt_output_t *output)
c->connector_type_id);
}
LOG(display, "%s: Selecting pipe %c\n", output->name,
pipe_name(output->config.pipe));
LOG(display, "%s: Selecting pipe %s\n", output->name,
kmstest_pipe_name(output->config.pipe));
display->pipes_in_use |= 1 << output->config.pipe;
}
@@ -902,9 +909,9 @@ static void igt_display_refresh(igt_display_t *display)
igt_assert_f(a->pending_crtc_idx_mask !=
b->pending_crtc_idx_mask,
"%s and %s are both trying to use pipe %c\n",
"%s and %s are both trying to use pipe %s\n",
igt_output_name(a), igt_output_name(b),
pipe_name(ffs(a->pending_crtc_idx_mask) - 1));
kmstest_pipe_name(ffs(a->pending_crtc_idx_mask) - 1));
}
}
@@ -1018,9 +1025,9 @@ static int igt_drm_plane_commit(igt_plane_t *plane,
if (plane->fb_changed && fb_id == 0) {
LOG(display,
"%s: SetPlane pipe %c, plane %d, disabling\n",
"%s: SetPlane pipe %s, plane %d, disabling\n",
igt_output_name(output),
pipe_name(output->config.pipe),
kmstest_pipe_name(output->config.pipe),
plane->index);
ret = drmModeSetPlane(display->drm_fd,
@@ -1038,9 +1045,9 @@ static int igt_drm_plane_commit(igt_plane_t *plane,
CHECK_RETURN(ret, fail_on_error);
} else if (plane->fb_changed || plane->position_changed) {
LOG(display,
"%s: SetPlane %c.%d, fb %u, position (%d, %d)\n",
"%s: SetPlane %s.%d, fb %u, position (%d, %d)\n",
igt_output_name(output),
pipe_name(output->config.pipe),
kmstest_pipe_name(output->config.pipe),
plane->index,
fb_id,
plane->crtc_x, plane->crtc_y);
@@ -1092,9 +1099,9 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,
if (gem_handle) {
LOG(display,
"%s: SetCursor pipe %c, fb %u %dx%d\n",
"%s: SetCursor pipe %s, fb %u %dx%d\n",
igt_output_name(output),
pipe_name(output->config.pipe),
kmstest_pipe_name(output->config.pipe),
gem_handle,
cursor->fb->width, cursor->fb->height);
@@ -1104,9 +1111,9 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,
cursor->fb->height);
} else {
LOG(display,
"%s: SetCursor pipe %c, disabling\n",
"%s: SetCursor pipe %s, disabling\n",
igt_output_name(output),
pipe_name(output->config.pipe));
kmstest_pipe_name(output->config.pipe));
ret = drmModeSetCursor(display->drm_fd, crtc_id,
0, 0, 0);
@@ -1122,9 +1129,9 @@ static int igt_cursor_commit_legacy(igt_plane_t *cursor,
int y = cursor->crtc_y;
LOG(display,
"%s: MoveCursor pipe %c, (%d, %d)\n",
"%s: MoveCursor pipe %s, (%d, %d)\n",
igt_output_name(output),
pipe_name(output->config.pipe),
kmstest_pipe_name(output->config.pipe),
x, y);
ret = drmModeMoveCursor(display->drm_fd, crtc_id, x, y);
@@ -1168,10 +1175,10 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,
if (fb_id) {
LOG(display,
"%s: SetCrtc pipe %c, fb %u, panning (%d, %d), "
"%s: SetCrtc pipe %s, fb %u, panning (%d, %d), "
"mode %dx%d\n",
igt_output_name(output),
pipe_name(output->config.pipe),
kmstest_pipe_name(output->config.pipe),
fb_id,
primary->pan_x, primary->pan_y,
mode->hdisplay, mode->vdisplay);
@@ -1185,9 +1192,9 @@ static int igt_primary_plane_commit_legacy(igt_plane_t *primary,
mode);
} else {
LOG(display,
"%s: SetCrtc pipe %c, disabling\n",
"%s: SetCrtc pipe %s, disabling\n",
igt_output_name(output),
pipe_name(output->config.pipe));
kmstest_pipe_name(output->config.pipe));
ret = drmModeSetCrtc(display->drm_fd,
crtc_id,
@@ -1391,8 +1398,8 @@ void igt_output_set_pipe(igt_output_t *output, enum pipe pipe)
LOG(display, "%s: set_pipe(any)\n", igt_output_name(output));
output->pending_crtc_idx_mask = -1UL;
} else {
LOG(display, "%s: set_pipe(%c)\n", igt_output_name(output),
pipe_name(pipe));
LOG(display, "%s: set_pipe(%s)\n", igt_output_name(output),
kmstest_pipe_name(pipe));
output->pending_crtc_idx_mask = 1 << pipe;
}
}
@@ -1410,7 +1417,7 @@ void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb)
igt_pipe_t *pipe = plane->pipe;
igt_display_t *display = pipe->display;
LOG(display, "%c.%d: plane_set_fb(%d)\n", pipe_name(pipe->pipe),
LOG(display, "%s.%d: plane_set_fb(%d)\n", kmstest_pipe_name(pipe->pipe),
plane->index, fb ? fb->fb_id : 0);
plane->fb = fb;
@@ -1423,8 +1430,8 @@ void igt_plane_set_position(igt_plane_t *plane, int x, int y)
igt_pipe_t *pipe = plane->pipe;
igt_display_t *display = pipe->display;
LOG(display, "%c.%d: plane_set_position(%d,%d)\n",
pipe_name(pipe->pipe), plane->index, x, y);
LOG(display, "%s.%d: plane_set_position(%d,%d)\n",
kmstest_pipe_name(pipe->pipe), plane->index, x, y);
plane->crtc_x = x;
plane->crtc_y = y;
@@ -1437,7 +1444,8 @@ void igt_plane_set_panning(igt_plane_t *plane, int x, int y)
igt_pipe_t *pipe = plane->pipe;
igt_display_t *display = pipe->display;
LOG(display, "%c.%d: plane_set_panning(%d,%d)\n", pipe_name(pipe->pipe),
LOG(display, "%s.%d: plane_set_panning(%d,%d)\n",
kmstest_pipe_name(pipe->pipe),
plane->index, x, y);
plane->pan_x = x;
@@ -1467,7 +1475,8 @@ void igt_plane_set_rotation(igt_plane_t *plane, igt_rotation_t rotation)
igt_pipe_t *pipe = plane->pipe;
igt_display_t *display = pipe->display;
LOG(display, "%c.%d: plane_set_rotation(%s)\n", pipe_name(pipe->pipe),
LOG(display, "%s.%d: plane_set_rotation(%s)\n",
kmstest_pipe_name(pipe->pipe),
plane->index, rotation_name(rotation));
plane->rotation = rotation;
lib/igt_kms.h
+1 -2
View File
@@ -40,7 +40,7 @@ enum pipe {
PIPE_C,
I915_MAX_PIPES
};
#define pipe_name(p) ((p) + 'A')
const char *kmstest_pipe_name(enum pipe pipe);
/* We namespace this enum to not conflict with the Android i915_drm.h */
enum igt_plane {
@@ -138,7 +138,6 @@ void kmstest_free_connector_config(struct kmstest_connector_config *config);
void kmstest_dump_mode(drmModeModeInfo *mode);
int kmstest_get_pipe_from_crtc_id(int fd, int crtc_id);
const char *kmstest_pipe_str(int pipe);
const char *kmstest_encoder_type_str(int type);
const char *kmstest_connector_status_str(int type);
const char *kmstest_connector_type_str(int type);