From: Daniel Vetter Date: Wed, 26 Mar 2014 09:19:42 +0000 (+0100) Subject: lib: fold igt_display into igt_kms X-Git-Tag: intel-gpu-tools-1.7~192 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64401f57e958998d537ff67525d5f1e9a4f76b22;p=platform%2Fupstream%2Fintel-gpu-tools.git lib: fold igt_display into igt_kms For 1 function and 2 types we kinda don't need separate files. Especially now that igt_kms is much more focused on the actual modeset stuff with all the framebuffer helpers extracted to igt_fb. Signed-off-by: Daniel Vetter --- diff --git a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml index bd8294e..1dafe6c 100644 --- a/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml +++ b/docs/reference/intel-gpu-tools/intel-gpu-tools-docs.xml @@ -18,7 +18,6 @@ - diff --git a/lib/Makefile.sources b/lib/Makefile.sources index f0f411d..62a0c75 100644 --- a/lib/Makefile.sources +++ b/lib/Makefile.sources @@ -8,8 +8,6 @@ libintel_tools_la_SOURCES = \ i915_pciids.h \ igt_debugfs.c \ igt_debugfs.h \ - igt_display.c \ - igt_display.h \ igt_aux.c \ igt_aux.h \ instdone.c \ diff --git a/lib/igt_debugfs.c b/lib/igt_debugfs.c index e04f8c5..81a06ff 100644 --- a/lib/igt_debugfs.c +++ b/lib/igt_debugfs.c @@ -33,7 +33,7 @@ #include #include "drmtest.h" -#include "igt_display.h" +#include "igt_kms.h" #include "igt_debugfs.h" /** diff --git a/lib/igt_display.c b/lib/igt_display.c deleted file mode 100644 index 28e21e6..0000000 --- a/lib/igt_display.c +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright © 2013 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include - -#include "drmtest.h" -#include "igt_display.h" - -void igt_wait_for_vblank(int drm_fd, enum pipe pipe) -{ - drmVBlank wait_vbl; - - memset(&wait_vbl, 0, sizeof(wait_vbl)); - - wait_vbl.request.type = pipe << DRM_VBLANK_HIGH_CRTC_SHIFT | - DRM_VBLANK_RELATIVE; - wait_vbl.request.sequence = 1; - - igt_assert(drmWaitVBlank(drm_fd, &wait_vbl) == 0); -} diff --git a/lib/igt_display.h b/lib/igt_display.h deleted file mode 100644 index 77a75a7..0000000 --- a/lib/igt_display.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright © 2013 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#ifndef __IGT_DISPLAY_H__ -#define __IGT_DISPLAY_H__ - -enum pipe { - PIPE_A = 0, - PIPE_B, - PIPE_C, - I915_MAX_PIPES -}; -#define pipe_name(p) ((p) + 'A') - -/* We namespace this enum to not conflict with the Android i915_drm.h */ -enum igt_plane { - IGT_PLANE_1 = 0, - IGT_PLANE_PRIMARY = IGT_PLANE_1, - IGT_PLANE_2, - IGT_PLANE_3, - IGT_PLANE_CURSOR, -}; - -const char *plane_name(enum igt_plane p); - -#define sprite_name(p, s) ((p) * dev_priv->num_plane + (s) + 'A') - -enum port { - PORT_A = 0, - PORT_B, - PORT_C, - PORT_D, - PORT_E, - I915_MAX_PORTS -}; -#define port_name(p) ((p) + 'A') - -void igt_wait_for_vblank(int drm_fd, enum pipe pipe); - -#endif /* __IGT_DISPLAY_H__ */ diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 1d4bad4..678cf39 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -993,3 +993,16 @@ void igt_plane_set_position(igt_plane_t *plane, int x, int y) plane->position_changed = true; } + +void igt_wait_for_vblank(int drm_fd, enum pipe pipe) +{ + drmVBlank wait_vbl; + + memset(&wait_vbl, 0, sizeof(wait_vbl)); + + wait_vbl.request.type = pipe << DRM_VBLANK_HIGH_CRTC_SHIFT | + DRM_VBLANK_RELATIVE; + wait_vbl.request.sequence = 1; + + igt_assert(drmWaitVBlank(drm_fd, &wait_vbl) == 0); +} diff --git a/lib/igt_kms.h b/lib/igt_kms.h index 1ba7d9b..439a634 100644 --- a/lib/igt_kms.h +++ b/lib/igt_kms.h @@ -33,7 +33,37 @@ #include -#include "igt_display.h" +enum pipe { + PIPE_A = 0, + PIPE_B, + PIPE_C, + I915_MAX_PIPES +}; +#define pipe_name(p) ((p) + 'A') + +/* We namespace this enum to not conflict with the Android i915_drm.h */ +enum igt_plane { + IGT_PLANE_1 = 0, + IGT_PLANE_PRIMARY = IGT_PLANE_1, + IGT_PLANE_2, + IGT_PLANE_3, + IGT_PLANE_CURSOR, +}; + +const char *plane_name(enum igt_plane p); + +#define sprite_name(p, s) ((p) * dev_priv->num_plane + (s) + 'A') + +enum port { + PORT_A = 0, + PORT_B, + PORT_C, + PORT_D, + PORT_E, + I915_MAX_PORTS +}; +#define port_name(p) ((p) + 'A') + #include "igt_fb.h" struct kmstest_connector_config { @@ -130,6 +160,8 @@ igt_plane_t *igt_output_get_plane(igt_output_t *output, enum igt_plane plane); void igt_plane_set_fb(igt_plane_t *plane, struct igt_fb *fb); void igt_plane_set_position(igt_plane_t *plane, int x, int y); +void igt_wait_for_vblank(int drm_fd, enum pipe pipe); + #define for_each_connected_output(display, output) \ for (int i__ = 0; i__ < (display)->n_outputs; i__++) \ if ((output = &(display)->outputs[i__]), output->valid)