From patchwork Wed Aug 26 06:21:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyungwon Hwang X-Patchwork-Id: 7074581 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 34764C05AC for ; Wed, 26 Aug 2015 06:22:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22C0D20823 for ; Wed, 26 Aug 2015 06:22:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CEA08207B3 for ; Wed, 26 Aug 2015 06:22:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 69B086E088; Tue, 25 Aug 2015 23:22:13 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout3.samsung.com (mailout3.samsung.com [203.254.224.33]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF6E66E3DD for ; Tue, 25 Aug 2015 23:22:11 -0700 (PDT) Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NTO00RIJF0X8F60@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Wed, 26 Aug 2015 15:22:09 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 47.B8.24422.11B5DD55; Wed, 26 Aug 2015 15:22:09 +0900 (KST) X-AuditID: cbfee68f-f793b6d000005f66-e6-55dd5b11144d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id BF.F3.23663.11B5DD55; Wed, 26 Aug 2015 15:22:09 +0900 (KST) Received: from localhost.localdomain.localdomain ([10.252.82.145]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NTO00I9XF0TTDY0@mmp2.samsung.com>; Wed, 26 Aug 2015 15:22:09 +0900 (KST) From: Hyungwon Hwang To: dri-devel@lists.freedesktop.org, ppaalanen@gmail.com, emil.l.velikov@gmail.com Subject: [PATCH 3/3] modetest: add atomic page flip support Date: Wed, 26 Aug 2015 15:21:48 +0900 Message-id: <1440570108-17354-3-git-send-email-human.hwang@samsung.com> X-Mailer: git-send-email 2.4.3 In-reply-to: <1440570108-17354-1-git-send-email-human.hwang@samsung.com> References: <1440570108-17354-1-git-send-email-human.hwang@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrILMWRmVeSWpSXmKPExsWyRsSkUFcw+m6owdLFkhZXvr5ns9hz9R6T xdIZfawWrW3VDiweO2fdZfe4332cyaNvyyrGAOYoLpuU1JzMstQifbsErozplz4zFZw3rNgy /S1bA+N39S5GDg4JAROJ45NMuxg5gUwxiQv31rN1MXJxCAmsYJRYdm0JK0TCRGJL8yQmiMQs Rok7sxcwQjhtTBKbVk1kBqliE9CTWHDtBzuILSIQIrFhy0Ywm1lAR+L6zS3MINuEBawldjw3 AQmzCKhKrLlzghHE5hVwl9i37SrUMjmJc+u/sIDYnAIeEpta7zOB2EJANWtu3wM7QkLgN5vE 9uM/mCEGCUh8m3yIBeIbWYlNB5gh5khKHFxxg2UCo/ACRoZVjKKpBckFxUnpRcZ6xYm5xaV5 6XrJ+bmbGIEhe/rfs/4djHcPWB9iFOBgVOLh/bDwdqgQa2JZcWXuIUZToA0TmaVEk/OBkZFX Em9obGZkYWpiamxkbmmmJM67UOpnsJBAemJJanZqakFqUXxRaU5q8SFGJg5OqQZGm00nNwez rws/8Vf+3ZkM3uabW99mbN+c6Bu89uSUxEzW++sjJp0sLu0Mz48uqVz/g6P4mmFy9d5nny/t mb3iItOtPK1LC9zTrWb1ccya01CdJbtjw8Jv+tuXnzni+XJt/rfitYvEWvwWcn9viRCyW3X0 x2GRJSrCV0Qu7nrLseF82sGr/oZe75VYijMSDbWYi4oTAUA1GJlUAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xoK5g9N1Qg4tfhS2ufH3PZrHn6j0m i6Uz+lgtWtuqHVg8ds66y+5xv/s4k0ffllWMAcxRDYw2GamJKalFCql5yfkpmXnptkrewfHO 8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUDrlBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6 hgTB9RgZoIGENYwZ0y99Zio4b1ixZfpbtgbG7+pdjJwcEgImEluaJzFB2GISF+6tZ+ti5OIQ EpjFKHFn9gJGCKeNSWLTqonMIFVsAnoSC679YAexRQRCJDZs2QhmMwvoSFy/uQWohoNDWMBa YsdzE5Awi4CqxJo7JxhBbF4Bd4l9266yQiyTkzi3/gsLiM0p4CGxqfU+2BFCQDVrbt9jmsDI u4CRYRWjRGpBckFxUnquYV5quV5xYm5xaV66XnJ+7iZGcGQ8k9rBeHCX+yFGAQ5GJR7eDwtv hwqxJpYVV+YeYpTgYFYS4e3WvRsqxJuSWFmVWpQfX1Sak1p8iNEU6LCJzFKiyfnAqM0riTc0 NjEzsjQyN7QwMjZXEueV3bA5VEggPbEkNTs1tSC1CKaPiYNTqoEx+mHEXvHeu2rTa35fNA+b 8UWljulZZO6+Yu+jt/44M96+qtOi2n14okGgyoSocMaIfz/abtYw/PqlJv6K7VxU9tIv0apu z5J5qgUuF/V2Vn3Q2qK/PPC0yL6yxzruj7Td/9S8nJBtarFoHl+biU6m05KQmJlx1uvZY+/W Ryr2T31953rNgs9KLMUZiYZazEXFiQB00aj6ogIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds support for atomic page flip. User can specify -V option with the plane id for testing atomic page flipping. --- tests/modetest/modetest.c | 153 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 149 insertions(+), 4 deletions(-) diff --git a/tests/modetest/modetest.c b/tests/modetest/modetest.c index 753a559..9bffa98 100644 --- a/tests/modetest/modetest.c +++ b/tests/modetest/modetest.c @@ -719,6 +719,10 @@ struct pipe_arg { struct timeval start; int swap_count; + + /* for atomic modeset */ + uint32_t plane_id; + uint32_t fb_obj_id; }; struct plane_arg { @@ -1444,7 +1448,7 @@ static int parse_property(struct property_arg *p, const char *arg) static void usage(char *name) { - fprintf(stderr, "usage: %s [-acDdefMPpsCvw]\n", name); + fprintf(stderr, "usage: %s [-acDdefMPpsCvVw]\n", name); fprintf(stderr, "\tA: supported in atomic modeset\n"); fprintf(stderr, "\tL: supported in legacy modeset\n"); @@ -1459,6 +1463,7 @@ static void usage(char *name) fprintf(stderr, "\n Atomic Test options: [A]\n\n"); fprintf(stderr, "\t-a\tuse atomic modeset\n"); + fprintf(stderr, "\t-V \ttest vsynced page flipping\n"); fprintf(stderr, "\n Legacy test options: [L]\n\n"); fprintf(stderr, "\t-P :x[++][*][@]\tset a plane\n"); @@ -1627,7 +1632,138 @@ static void atomic_modeset(struct device *dev, drmModeAtomicReqPtr req, drmModeAtomicCommit(dev->fd, req, flags, NULL); } -static char optstr[] = "acdD:efM:P:ps:Cvw:"; +static void +atomic_page_flip_handler(int fd, unsigned int frame, + unsigned int sec, unsigned int usec, void *data) +{ + static drmModeAtomicReqPtr req = NULL; + unsigned int new_fb_id; + struct timeval end; + struct pipe_arg *pipe; + double t; + uint32_t flags = 0; + + pipe = (struct pipe_arg *)(unsigned long)data; + + if (pipe->current_fb_id == pipe->fb_id[0]) + new_fb_id = pipe->fb_id[1]; + else + new_fb_id = pipe->fb_id[0]; + + pipe->current_fb_id = new_fb_id; + pipe->swap_count++; + + req = drmModeAtomicAlloc(); + + drmModeAtomicAddProperty(req, pipe->plane_id, pipe->fb_obj_id, new_fb_id); + + flags = DRM_MODE_PAGE_FLIP_EVENT; + drmModeAtomicCommit(fd, req, flags, pipe); + + if (pipe->swap_count == 60) { + gettimeofday(&end, NULL); + t = end.tv_sec + end.tv_usec * 1e-6 - + (pipe->start.tv_sec + pipe->start.tv_usec * 1e-6); + fprintf(stderr, "freq: %.02fHz\n", pipe->swap_count / t); + pipe->swap_count = 0; + pipe->start = end; + } + + drmModeAtomicFree(req); +} + +static int atomic_test_page_flip(struct device *dev, drmModeAtomicReqPtr req, + struct resources *res, struct property_arg *prop_args, + unsigned int prop_count,unsigned int plane_id) +{ + struct bo *other_bo; + unsigned int other_fb_id; + struct pipe_arg *pipe = NULL; + drmEventContext evctx; + uint32_t flags = 0, fb_obj_id = 0, pixel_format; + uint64_t width, height; + int ret; + + if (!is_obj_id_in_prop_args(prop_args, prop_count, plane_id)) + return -1; + + fb_obj_id = get_atomic_plane_prop_id(res, plane_id, "FB_ID"); + if (!fb_obj_id) + return -1; + + width = get_value_in_prop_args(prop_args, prop_count, plane_id, + "SRC_W"); + height = get_value_in_prop_args(prop_args, prop_count, plane_id, + "SRC_H"); + pixel_format = DRM_FORMAT_XRGB8888; + + ret = allocate_fb(dev, req, res, width, height, pixel_format, + PATTERN_TILES, &other_bo, &other_fb_id); + if (ret < 0) + return ret; + + ret = drmModeAtomicAddProperty(req, plane_id, fb_obj_id, + other_fb_id); + if (ret < 0) + goto err; + + if (!fb_obj_id) { + fprintf(stderr, "page flipping requires at least one plane setting.\n"); + return -1; + } + + pipe = drmMalloc(sizeof *pipe); + + gettimeofday(&pipe->start, NULL); + pipe->swap_count = 0; + pipe->plane_id = plane_id; + pipe->fb_obj_id = fb_obj_id; + pipe->fb_id[0] = dev->mode.fb_id; + pipe->fb_id[1] = other_fb_id; + pipe->current_fb_id = other_fb_id; + + flags = DRM_MODE_PAGE_FLIP_EVENT; + + ret = drmModeAtomicCommit(dev->fd, req, flags, pipe); + if (ret < 0) + goto err_rmfb; + + memset(&evctx, 0, sizeof evctx); + evctx.version = DRM_EVENT_CONTEXT_VERSION; + evctx.vblank_handler = NULL; + evctx.page_flip_handler = atomic_page_flip_handler; + + while (1) { + struct timeval timeout = { .tv_sec = 3, .tv_usec = 0 }; + fd_set fds; + int ret; + + FD_ZERO(&fds); + FD_SET(0, &fds); + FD_SET(dev->fd, &fds); + ret = select(dev->fd + 1, &fds, NULL, NULL, &timeout); + + if (ret <= 0) { + fprintf(stderr, "select timed out or error (ret %d)\n", + ret); + continue; + } else if (FD_ISSET(0, &fds)) { + break; + } + + drmHandleEvent(dev->fd, &evctx); + } + +err_rmfb: + drmFree(pipe); + drmModeRmFB(dev->fd, other_fb_id); +err: + bo_destroy(other_bo); + + return 0; +} + +static char optstr[] = "acdD:efM:P:ps:CvV:w:"; int main(int argc, char **argv) { @@ -1641,7 +1777,7 @@ int main(int argc, char **argv) const char *modules[] = { "i915", "radeon", "nouveau", "vmwgfx", "omapdrm", "exynos", "tilcdc", "msm", "sti", "tegra", "imx-drm", "rockchip", "atmel-hlcdc" }; char *device = NULL; char *module = NULL; - unsigned int i; + unsigned int i, flip_plane_id = 0; int count = 0, plane_count = 0; unsigned int prop_count = 0; struct pipe_arg *pipe_args = NULL; @@ -1723,6 +1859,11 @@ int main(int argc, char **argv) case 'v': test_vsync = 1; break; + case 'V': + if (sscanf(optarg, "%u", &flip_plane_id) != 1) + usage(argv[0]); + test_vsync = 1; + break; case 'w': prop_args = realloc(prop_args, (prop_count + 1) * sizeof *prop_args); @@ -1775,7 +1916,7 @@ int main(int argc, char **argv) return -1; } - if (test_vsync && !count) { + if (test_vsync && (!count && !req)) { fprintf(stderr, "page flipping requires at least one -s option.\n"); return -1; } @@ -1811,6 +1952,10 @@ int main(int argc, char **argv) atomic_modeset(&dev, req, dev.resources, prop_args, prop_count); + if (test_vsync) + atomic_test_page_flip(&dev, req, dev.resources, + prop_args, prop_count, flip_plane_id); + getchar(); } else { for (i = 0; i < prop_count; ++i)