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

lib: Introduce symbolic names for display planes

Browse Source 
It'd be nice to have symbolic names for planes instead of using an index
in igt_output_get_plane().

We also namespace the enum to not conflict with anyone.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2014-02-02 17:48:24 +00:00
parent 417987353e
commit 09e84cee8b
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/igt_display.h
View File

@ -33,16 +33,16 @@ enum pipe {
}; };
#define pipe_name(p) ((p) + 'A') #define pipe_name(p) ((p) + 'A')
/* FIXME: i915_drm.h on Android pollutes the general namespace. */ /* We namespace this enum to not conflict with the Android i915_drm.h */
#undef PLANE_A enum igt_plane {
#undef PLANE_B IGT_PLANE_1 = 0,
IGT_PLANE_PRIMARY = IGT_PLANE_1,
enum plane { IGT_PLANE_2,
PLANE_A = 0, IGT_PLANE_3,
PLANE_B, IGT_PLANE_CURSOR,
PLANE_C,
}; };
#define plane_name(p) ((p) + 'A')
const char *plane_name(enum igt_plane p);
#define sprite_name(p, s) ((p) * dev_priv->num_plane + (s) + 'A') #define sprite_name(p, s) ((p) * dev_priv->num_plane + (s) + 'A')

18
lib/igt_kms.c
View File

@ -765,6 +765,20 @@ void kmstest_free_connector_config(struct kmstest_connector_config *config)
drmModeFreeConnector(config->connector); drmModeFreeConnector(config->connector);
} }
const char *plane_name(enum igt_plane p)
{
static const char *names[] = {
[IGT_PLANE_1] = "plane1",
[IGT_PLANE_2] = "plane2",
[IGT_PLANE_3] = "plane3",
[IGT_PLANE_CURSOR] = "cursor",
};
igt_assert(p < ARRAY_SIZE(names) && names[p]);
return names[p];
}
/* /*
* A small modeset API * A small modeset API
*/ */
@ -1107,12 +1121,12 @@ static igt_plane_t *igt_pipe_get_plane(igt_pipe_t *pipe, int index)
return &pipe->planes[index]; return &pipe->planes[index];
} }
igt_plane_t *igt_ouput_get_plane(igt_output_t *output, int index) igt_plane_t *igt_ouput_get_plane(igt_output_t *output, enum igt_plane plane)
{ {
igt_pipe_t *pipe; igt_pipe_t *pipe;
pipe = igt_output_get_driving_pipe(output); pipe = igt_output_get_driving_pipe(output);
return igt_pipe_get_plane(pipe, 0); return igt_pipe_get_plane(pipe, plane);
} }
void igt_plane_set_fb(igt_plane_t *plane, struct kmstest_fb *fb) void igt_plane_set_fb(igt_plane_t *plane, struct kmstest_fb *fb)

2
lib/igt_kms.h
View File

@ -154,7 +154,7 @@ void igt_display_set_verbose(igt_display_t *display, bool verbose);
const char *igt_output_name(igt_output_t *output); const char *igt_output_name(igt_output_t *output);
drmModeModeInfo *igt_output_get_mode(igt_output_t *output); drmModeModeInfo *igt_output_get_mode(igt_output_t *output);
void igt_output_set_pipe(igt_output_t *output, enum pipe pipe); void igt_output_set_pipe(igt_output_t *output, enum pipe pipe);
igt_plane_t *igt_ouput_get_plane(igt_output_t *output, int index); igt_plane_t *igt_ouput_get_plane(igt_output_t *output, enum igt_plane plane);
void igt_plane_set_fb(igt_plane_t *plane, struct kmstest_fb *fb); void igt_plane_set_fb(igt_plane_t *plane, struct kmstest_fb *fb);