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

testdisplay: Use DRM_MODE_FLAG_3D_MASK

Browse Source 
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
This commit is contained in:
Damien Lespiau 2013-09-26 17:56:01 +01:00
parent 578c1cefc9
commit a7d1937cd7
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/drmtest.c
View File

@ -1784,7 +1784,7 @@ type_name_fn(connector_type)
void kmstest_dump_mode(drmModeModeInfo *mode) void kmstest_dump_mode(drmModeModeInfo *mode)
{ {
bool stereo_3d = mode->flags & DRMTEST_MODE_FLAG_3D_MASK; bool stereo_3d = mode->flags & DRM_MODE_FLAG_3D_MASK;
char flags_str[32]; char flags_str[32];
#define PRINT_S(name) "%s" #define PRINT_S(name) "%s"

9
lib/drmtest.h
View File

@ -288,15 +288,6 @@ bool igt_run_in_simulation(void);
*/ */
void igt_skip_on_simulation(void); void igt_skip_on_simulation(void);
#define DRMTEST_MODE_FLAG_3D_MASK (DRM_MODE_FLAG_3D_FRAME_PACKING | \
DRM_MODE_FLAG_3D_FIELD_ALTERNATIVE | \
DRM_MODE_FLAG_3D_LINE_ALTERNATIVE | \
DRM_MODE_FLAG_3D_SIDE_BY_SIDE_FULL | \
DRM_MODE_FLAG_3D_L_DEPTH | \
DRM_MODE_FLAG_3D_L_DEPTH_GFX_GFX_DEPTH | \
DRM_MODE_FLAG_3D_TOP_AND_BOTTOM | \
DRM_MODE_FLAG_3D_SIDE_BY_SIDE_HALF)
/* helpers based upon the libdrm buffer manager */ /* helpers based upon the libdrm buffer manager */
void igt_init_aperture_trashers(drm_intel_bufmgr *bufmgr); void igt_init_aperture_trashers(drm_intel_bufmgr *bufmgr);
void igt_trash_aperture(void); void igt_trash_aperture(void);

9
tests/testdisplay.c
View File

@ -366,7 +366,8 @@ set_mode(struct connector *c)
c->mode = c->connector->modes[j]; c->mode = c->connector->modes[j];
/* set_mode() only tests 2D modes */ /* set_mode() only tests 2D modes */
c->mode.flags &= ~DRMTEST_MODE_FLAG_3D_MASK; if (c->mode.flags & DRM_MODE_FLAG_3D_MASK)
continue;
if (!c->mode_valid) if (!c->mode_valid)
continue; continue;
@ -436,7 +437,7 @@ static void box_print(const char * prefix, struct box *box)
static void stereo_fb_layout_from_mode(struct stereo_fb_layout *layout, static void stereo_fb_layout_from_mode(struct stereo_fb_layout *layout,
drmModeModeInfo *mode) drmModeModeInfo *mode)
{ {
unsigned int format = mode->flags & DRMTEST_MODE_FLAG_3D_MASK; unsigned int format = mode->flags & DRM_MODE_FLAG_3D_MASK;
const int hdisplay = mode->hdisplay, vdisplay = mode->vdisplay; const int hdisplay = mode->hdisplay, vdisplay = mode->vdisplay;
int middle; int middle;
@ -479,7 +480,7 @@ static void stereo_fb_layout_from_mode(struct stereo_fb_layout *layout,
static const char *stereo_mode_str(drmModeModeInfo *mode) static const char *stereo_mode_str(drmModeModeInfo *mode)
{ {
unsigned int layout = mode->flags & DRMTEST_MODE_FLAG_3D_MASK; unsigned int layout = mode->flags & DRM_MODE_FLAG_3D_MASK;
switch (layout) { switch (layout) {
case DRM_MODE_FLAG_3D_TOP_AND_BOTTOM: case DRM_MODE_FLAG_3D_TOP_AND_BOTTOM:
@ -554,7 +555,7 @@ set_stereo_mode(struct connector *c)
if (!c->mode_valid) if (!c->mode_valid)
continue; continue;
if (!(c->mode.flags & DRMTEST_MODE_FLAG_3D_MASK)) if (!(c->mode.flags & DRM_MODE_FLAG_3D_MASK))
continue; continue;
do_set_stereo_mode(c); do_set_stereo_mode(c);