From patchwork Mon Nov 30 04:35:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hyungwon Hwang X-Patchwork-Id: 7720961 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 519B0BEEE1 for ; Mon, 30 Nov 2015 04:35:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2F8E62060A for ; Mon, 30 Nov 2015 04:35:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 98B6B20511 for ; Mon, 30 Nov 2015 04:35:15 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D6D76E4CB; Sun, 29 Nov 2015 20:35:13 -0800 (PST) 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 4A5C26E4CB for ; Sun, 29 Nov 2015 20:35:12 -0800 (PST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NYM00M7R22L5CA0@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 30 Nov 2015 13:35:09 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 50.51.04790.DF1DB565; Mon, 30 Nov 2015 13:35:09 +0900 (KST) X-AuditID: cbfee691-f79766d0000012b6-c4-565bd1fdfec0 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 35.08.13906.DF1DB565; Mon, 30 Nov 2015 13:35:09 +0900 (KST) Received: from localhost.localdomain ([10.252.82.145]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NYM00C4Q22JVO30@mmp1.samsung.com>; Mon, 30 Nov 2015 13:35:09 +0900 (KST) From: Hyungwon Hwang To: dri-devel@lists.freedesktop.org, emil.l.velikov@gmail.com, jy0922.shim@samsung.com, inki.dae@samsung.com, human.hwang@samsung.com, tjakobi@math.uni-bielefeld.de Subject: [PATCH] drm: Implement drmHandleEvent2() Date: Mon, 30 Nov 2015 13:35:06 +0900 Message-id: <1448858106-29426-1-git-send-email-human.hwang@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNLMWRmVeSWpSXmKPExsWyRsSkUPfvxegwg59tVhZXvr5ns9hz9R6T xdIZfawWk+5PYLF4ce8ii0Xb6g+sDmweO2fdZfe4332cyePfMXaPvi2rGANYorhsUlJzMstS i/TtErgyzu7azVywUKri0XTfBsb9ol2MnBwSAiYSk6c8YoGwxSQu3FvP1sXIxSEksIJRYtfl h0xdjBxgRTsv2EPElzJKPH+7FKroB6PEjcftbCDdbAJ6Eguu/WAHsUVAuucsdQKxhQUMJb5/ vM0KMohFQFVixYd8kDCvgLvEz6MPmSEWy0mcPDaZFWSmhMBzNomJey+BzWQREJD4NvkQC8QR shKbDkDVS0ocXHGDZQKjwAJGhlWMoqkFyQXFSelFpnrFibnFpXnpesn5uZsYgWF4+t+ziTsY 7x+wPsQowMGoxMMrYRYdJsSaWFZcmXuI0RRow0RmKdHkfGCw55XEGxqbGVmYmpgaG5lbmimJ 8+pI/wwWEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwOi3tOqaVcIW4X+nVPYbCXzpbEyaU6mf qaB40fz0l+sTuTTuXTPLPcES8D60ND+3Q8Oa65736dI9Z37vvbYicfuVJo/pj2eEh/luerFw n+WjdRtkwjgDa0Q2vvV+prAx5O2hKyJvF2dZJUpd2mogf3qD4i4jvRVxorXh6b/v7wtYrrhL P/yD8lclluKMREMt5qLiRACCY2K3PgIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBLMWRmVeSWpSXmKPExsVy+t9jAd2/F6PDDLbeM7a48vU9m8Weq/eY LJbO6GO1mHR/AovFi3sXWSzaVn9gdWDz2DnrLrvH/e7jTB7/jrF79G1ZxRjAEtXAaJORmpiS WqSQmpecn5KZl26r5B0c7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtF1JoSwxpxQoFJBY XKykb4dpQmiIm64FTGOErm9IEFyPkQEaSFjDmHF2127mgoVSFY+m+zYw7hftYuTgkBAwkdh5 wb6LkRPIFJO4cG89WxcjF4eQwFJGiedvl0I5PxglbjxuZwOpYhPQk1hw7Qc7iC0isIJRYs5S JxBbWMBQ4vvH26wgQ1kEVCVWfMgHCfMKuEv8PPqQGWKBnMTJY5NZJzByLWBkWMUokVqQXFCc lJ5rmJdarlecmFtcmpeul5yfu4kRHOrPpHYwHtzlfohRgINRiYdXwiw6TIg1say4MvcQowQH s5IIr9oxoBBvSmJlVWpRfnxRaU5q8SFGU6D9E5mlRJPzgXGYVxJvaGxiZmRpZG5oYWRsriTO W3spMkxIID2xJDU7NbUgtQimj4mDU6qBse1m3cqrzFslS15usMmtZNpdqML/bVlALpv8Zq/q iKuO0dcjJdUCEhJeTVrWvGP75DyF32lZiXq7Tc88//tfNvjpcf7/WTP+Xglo3ybe/u/Atq38 /8uPtPNydW7NmBIk++voJqPJnJ/2XTkae3tJU94r1aW7Xq/IsJap6ni794aZQmOejJ2JpxJL cUaioRZzUXEiAKcgY6mLAgAA 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 From: Tobias Jakobi Basically this is an extended version of drmHandleEvent(). drmHandleEvent() only handles core events (like e.g. page flips), but since kernel DRM drivers might use vendor-specific events to signal userspace the completion of pending jobs, etc., its desirable to provide a way to handle these without putting vendor-specific code in the core libdrm. To use this you provide drmHandleEvent2() with a function that handles your non-core events. The signature of that function looks like this: void vendor(int fd, struct drm_event *e, void *ctx); 'fd' is the DRM file descriptor, 'e' the non-core event and 'ctx' the event context (casted to void). This way we don't have to maintain a copy of drmHandleEvent() in the vendor code. Signed-off-by: Tobias Jakobi --- Changes for v2: - Remove the opaque pointer, since this can be better handled with a container approach. This patch is separated from Tobias's patchset. Please refer to http://lists.freedesktop.org/archives/dri-devel/2015-November/095456.html xf86drm.h | 21 +++++++++++++++++++++ xf86drmMode.c | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) -- 1.9.1 diff --git a/xf86drm.h b/xf86drm.h index 481d882..1e474a3 100644 --- a/xf86drm.h +++ b/xf86drm.h @@ -750,8 +750,29 @@ typedef struct _drmEventContext { } drmEventContext, *drmEventContextPtr; +typedef void (*drmEventVendorHandler)(int fd, struct drm_event *e, void *ctx); + extern int drmHandleEvent(int fd, drmEventContextPtr evctx); +/* + * drmHandleEvent2() is an extended variant of drmHandleEvent() which + * allows handling of vendor-specific/non-core events. + * The function pointer 'vendorhandler' is used (if non-zero) to + * process non-core events. Users of have to prepare a container struct + * in the following way: + * + * struct vendor_event_context { + * drmEventContext base; + * int vendor_specific_data[num]; + * }; + * + * And then call: + * struct vendor_event_context ctx = {0}; + * drmHandleEvent2(fd, &ctx.base, handler); + */ +extern int drmHandleEvent2(int fd, drmEventContextPtr evctx, + drmEventVendorHandler vendorhandler); + extern char *drmGetDeviceNameFromFd(int fd); extern int drmGetNodeTypeFromFd(int fd); diff --git a/xf86drmMode.c b/xf86drmMode.c index ab6b519..89698da 100644 --- a/xf86drmMode.c +++ b/xf86drmMode.c @@ -867,7 +867,8 @@ int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size, return DRM_IOCTL(fd, DRM_IOCTL_MODE_SETGAMMA, &l); } -int drmHandleEvent(int fd, drmEventContextPtr evctx) +int drmHandleEvent2(int fd, drmEventContextPtr evctx, + drmEventVendorHandler vendorhandler) { char buffer[1024]; int len, i; @@ -910,6 +911,8 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) U642VOID (vblank->user_data)); break; default: + if (vendorhandler) + vendorhandler(fd, e, evctx); break; } i += e->length; @@ -918,6 +921,11 @@ int drmHandleEvent(int fd, drmEventContextPtr evctx) return 0; } +int drmHandleEvent(int fd, drmEventContextPtr evctx) +{ + return drmHandleEvent2(fd, evctx, NULL); +} + int drmModePageFlip(int fd, uint32_t crtc_id, uint32_t fb_id, uint32_t flags, void *user_data) {