diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-07-10 23:12:11 -0700 |
---|---|---|
committer | Lucas De Marchi <lucas.demarchi@intel.com> | 2021-07-15 12:01:57 -0700 |
commit | bea0606e41a868ac717cac7b1f66b5ebcb906672 (patch) | |
tree | 4f891446ffd923bf8d84cf2fccfedfaf04983b3f /tests/kms_sequence.c | |
parent | 70e9e273951250dc2988116c5ec317143d54e783 (diff) |
tests/kms_sequence: nuke local drm definitions
Use the ones from kernel headers.
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Diffstat (limited to 'tests/kms_sequence.c')
-rw-r--r-- | tests/kms_sequence.c | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/tests/kms_sequence.c b/tests/kms_sequence.c index bd810a5c..17cc5ab3 100644 --- a/tests/kms_sequence.c +++ b/tests/kms_sequence.c @@ -56,26 +56,6 @@ typedef struct { #define FORKED 4 } data_t; -struct local_drm_crtc_get_sequence { - __u32 crtc_id; - __u32 active; - __u64 sequence; - __u64 sequence_ns; -}; - -struct local_drm_crtc_queue_sequence { - __u32 crtc_id; - __u32 flags; - __u64 sequence; - __u64 user_data; -}; - -#define LOCAL_DRM_IOCTL_CRTC_GET_SEQUENCE DRM_IOWR(0x3b, struct local_drm_crtc_get_sequence) -#define LOCAL_DRM_IOCTL_CRTC_QUEUE_SEQUENCE DRM_IOWR(0x3c, struct local_drm_crtc_queue_sequence) - -#define LOCAL_DRM_CRTC_SEQUENCE_RELATIVE 0x00000001 /* sequence is relative to current */ -#define LOCAL_DRM_CRTC_SEQUENCE_NEXT_ON_MISS 0x00000002 /* Use next sequence if we've missed */ - struct local_drm_event_crtc_sequence { struct drm_event base; __u64 user_data; @@ -133,23 +113,23 @@ static void cleanup_crtc(data_t *data, int fd, igt_output_t *output) igt_display_commit(display); } -static int crtc_get_sequence(int fd, struct local_drm_crtc_get_sequence *cgs) +static int crtc_get_sequence(int fd, struct drm_crtc_get_sequence *cgs) { int err; err = 0; - if (igt_ioctl(fd, LOCAL_DRM_IOCTL_CRTC_GET_SEQUENCE, cgs)) + if (igt_ioctl(fd, DRM_IOCTL_CRTC_GET_SEQUENCE, cgs)) err = -errno; return err; } -static int crtc_queue_sequence(int fd, struct local_drm_crtc_queue_sequence *cqs) +static int crtc_queue_sequence(int fd, struct drm_crtc_queue_sequence *cqs) { int err; err = 0; - if (igt_ioctl(fd, LOCAL_DRM_IOCTL_CRTC_QUEUE_SEQUENCE, cqs)) + if (igt_ioctl(fd, DRM_IOCTL_CRTC_QUEUE_SEQUENCE, cqs)) err = -errno; return err; } @@ -174,11 +154,11 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int)) nchildren); if (data->flags & BUSY) { - struct local_drm_crtc_queue_sequence cqs; + struct drm_crtc_queue_sequence cqs; memset(&cqs, 0, sizeof(cqs)); cqs.crtc_id = data->crtc_id; - cqs.flags = LOCAL_DRM_CRTC_SEQUENCE_RELATIVE; + cqs.flags = DRM_CRTC_SEQUENCE_RELATIVE; cqs.sequence = 120 + 12; igt_assert_eq(crtc_queue_sequence(fd, &cqs), 0); } @@ -210,7 +190,7 @@ static void run_test(data_t *data, int fd, void (*testfunc)(data_t *, int, int)) static void sequence_get(data_t *data, int fd, int nchildren) { - struct local_drm_crtc_get_sequence cgs; + struct drm_crtc_get_sequence cgs; struct timespec start, end; unsigned long sq, count = 0; @@ -233,8 +213,8 @@ static void sequence_get(data_t *data, int fd, int nchildren) static void sequence_queue(data_t *data, int fd, int nchildren) { - struct local_drm_crtc_get_sequence cgs_start, cgs_end; - struct local_drm_crtc_queue_sequence cqs; + struct drm_crtc_get_sequence cgs_start, cgs_end; + struct drm_crtc_queue_sequence cqs; unsigned long target; int total = 120 / nchildren; int n; |