From patchwork Sun Nov 22 18:48:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Jakobi X-Patchwork-Id: 7676851 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BD27D9F1C2 for ; Sun, 22 Nov 2015 18:48:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA39520710 for ; Sun, 22 Nov 2015 18:48:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4307520712 for ; Sun, 22 Nov 2015 18:48:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752574AbbKVSsz (ORCPT ); Sun, 22 Nov 2015 13:48:55 -0500 Received: from smtp.math.uni-bielefeld.de ([129.70.45.10]:45753 "EHLO smtp.math.uni-bielefeld.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbbKVSsz (ORCPT ); Sun, 22 Nov 2015 13:48:55 -0500 Received: from chidori.local (dslb-092-077-040-173.092.077.pools.vodafone-ip.de [92.77.40.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by smtp.math.uni-bielefeld.de (Postfix) with ESMTPSA id 580D46118C; Sun, 22 Nov 2015 19:48:53 +0100 (CET) From: Tobias Jakobi To: linux-samsung-soc@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, emil.l.velikov@gmail.com, jy0922.shim@samsung.com, inki.dae@samsung.com, human.hwang@samsung.com, Tobias Jakobi Subject: [PATCH v2 01/13] drm: Implement drmHandleEvent2() Date: Sun, 22 Nov 2015 19:48:31 +0100 Message-Id: <1448218123-21292-2-git-send-email-tjakobi@math.uni-bielefeld.de> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1448218123-21292-1-git-send-email-tjakobi@math.uni-bielefeld.de> References: <1448218123-21292-1-git-send-email-tjakobi@math.uni-bielefeld.de> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 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. v2: Remove the opaque pointer, since this can be better handled with a container approach. Signed-off-by: Tobias Jakobi --- xf86drm.h | 21 +++++++++++++++++++++ xf86drmMode.c | 10 +++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) 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) {