From patchwork Thu May 28 00:57:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 6495591 Return-Path: X-Original-To: patchwork-dri-devel@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 43ED69F1C1 for ; Thu, 28 May 2015 00:57:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 551DF20732 for ; Thu, 28 May 2015 00:57:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 389892072F for ; Thu, 28 May 2015 00:57:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A07526E1AD; Wed, 27 May 2015 17:57:36 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by gabe.freedesktop.org (Postfix) with ESMTP id 91ABE6E1AD for ; Wed, 27 May 2015 17:57:34 -0700 (PDT) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NP100MIGBZXAG50@mailout2.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 28 May 2015 09:57:33 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id EC.3A.17770.DF766655; Thu, 28 May 2015 09:57:33 +0900 (KST) X-AuditID: cbfee691-f79ca6d00000456a-f3-556667fd0ba3 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 41.AA.05312.DF766655; Thu, 28 May 2015 09:57:33 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NP100MA3BZXO370@mmp1.samsung.com>; Thu, 28 May 2015 09:57:33 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] xf86drm: remove to open the DRM device unnecessarily Date: Thu, 28 May 2015 09:57:40 +0900 Message-id: <1432774660-9772-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGLMWRmVeSWpSXmKPExsWyRsSkQPdvelqowaIbxhZXvr5ns9hz9R6T xYt7F1kcmD12zrrL7nG/+ziTR9+WVYwBzFFcNimpOZllqUX6dglcGWs3bGUqOMhW0ds/lbGB cQ5rFyMnh4SAiUTb/qdQtpjEhXvr2boYuTiEBJYySty/v5gdpmjr1vVgtpDAIkaJC38MIYp+ MEp82HQUrJtNQE/izrbjTCC2iICyxN+JqxhBbGYBU4mmmwfBbGEBV4nl5xtZQGwWAVWJ//tX gsV5BdwkJszbyASxTE7i5LHJrCALJASus0ksunyCGaJBQOLb5ENAzRxACVmJTQeYIeolJQ6u uMEygVFwASPDKkbR1ILkguKk9CJTveLE3OLSvHS95PzcTYzA4Dv979nEHYz3D1gfYhTgYFTi 4c2QTA0VYk0sK67MPcRoCrRhIrOUaHI+MMTzSuINjc2MLExNTI2NzC3NlMR5daR/BgsJpCeW pGanphakFsUXleakFh9iZOLglGpgFKrmXXdQj+1Ww6cvVwReet8qz9qa95h5TrXS7xK2I6dy 106PXqlTFPe0Lm3zgVvLC9nkxNd8t/82t7Fds1L74EJziX8vGj/db9xl8vrr/LW212Z9L76S a3lI3v3ao9Io+8Mlx1imax6SmMZ/4vjOCq1SPofYqYL903m+hClqK3U2qG1K8PwVo8RSnJFo qMVcVJwIAM21noo5AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrALMWRmVeSWpSXmKPExsVy+t9jAd2/6WmhBvta9S2ufH3PZrHn6j0m ixf3LrI4MHvsnHWX3eN+93Emj74tqxgDmKMaGG0yUhNTUosUUvOS81My89JtlbyD453jTc0M DHUNLS3MlRTyEnNTbZVcfAJ03TJzgFYpKZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLr MTJAAwlrGDPWbtjKVHCQraK3fypjA+Mc1i5GTg4JAROJrVvXs0PYYhIX7q1nA7GFBBYxSlz4 Y9jFyAVk/2CU+LDpKFgDm4CexJ1tx5lAbBEBZYm/E1cxgtjMAqYSTTcPgtnCAq4Sy883soDY LAKqEv/3rwSL8wq4SUyYt5EJYpmcxMljk1knMHIvYGRYxSiaWpBcUJyUnmukV5yYW1yal66X nJ+7iREc2s+kdzCuarA4xCjAwajEw3tAOjVUiDWxrLgy9xCjBAezkgjvF8+0UCHelMTKqtSi /Pii0pzU4kOMpkDbJzJLiSbnA+MuryTe0NjEzMjSyNzQwsjYXEmc92S+T6iQQHpiSWp2ampB ahFMHxMHp1QDo+p6qfY9qxsDLs9JXbVF8eQiO3aJII/iuHXbd0yP+Hs67Gi11qxzChtcS7bP LY9I/Vhw8MikP5lXlM8X3jU+LKJ+Seve3vjGy6tlNq+s8c4vKup9Iy0qsz0unan+0J6odzYv 2x62OkyaIJty5mXzTLstm50jt594s9xr23/z7rqqoJfSF5YbL1NiKc5INNRiLipOBAAGteBs gwIAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: emil.l.velikov@gmail.com 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 This is to remove to open the DRM device unnecessarily as call drmAvailable() when name is NULL or drm_server_info is NULL in drmOpenWithType function. Signed-off-by: Joonyoung Shim --- xf86drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86drm.c b/xf86drm.c index b5a174b..900e4b1 100644 --- a/xf86drm.c +++ b/xf86drm.c @@ -725,7 +725,7 @@ int drmOpen(const char *name, const char *busid) */ int drmOpenWithType(const char *name, const char *busid, int type) { - if (!drmAvailable() && name != NULL && drm_server_info) { + if (name != NULL && drm_server_info && !drmAvailable()) { /* try to load the kernel module */ if (!drm_server_info->load_module(name)) { drmMsg("[drm] failed to load kernel module \"%s\"\n", name);