From patchwork Mon Dec 30 07:01:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seung-Woo Kim X-Patchwork-Id: 3417761 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 19FABC02DC for ; Mon, 30 Dec 2013 07:01:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24C49200F2 for ; Mon, 30 Dec 2013 07:01:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 04206200F0 for ; Mon, 30 Dec 2013 07:01:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EB4AEFB31A; Sun, 29 Dec 2013 23:01:29 -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 ESMTP id E8266FB31A for ; Sun, 29 Dec 2013 23:01:27 -0800 (PST) Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MYL008HTY6DJV30@mailout3.samsung.com> for dri-devel@lists.freedesktop.org; Mon, 30 Dec 2013 16:01:25 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 8E.ED.14803.44A11C25; Mon, 30 Dec 2013 16:01:24 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-1d-52c11a4439c9 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 00.B8.28157.44A11C25; Mon, 30 Dec 2013 16:01:24 +0900 (KST) Received: from localhost.localdomain ([10.252.75.83]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MYL00ITQY6A8U70@mmp1.samsung.com>; Mon, 30 Dec 2013 16:01:24 +0900 (KST) From: Seung-Woo Kim To: dri-devel@lists.freedesktop.org, inki.dae@samsung.com Subject: [PATCH] drm/exynos: fix build error caused by removed drm core macros Date: Mon, 30 Dec 2013 16:01:29 +0900 Message-id: <1388386889-32612-1-git-send-email-sw0312.kim@samsung.com> X-Mailer: git-send-email 1.7.4.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGLMWRmVeSWpSXmKPExsWyRsSkQNdF6mCQwZI10ha9504yWVz5+p7N YtL9CSwWMya/ZHNg8dj+7QGrx/3u40wefVtWMQYwR3HZpKTmZJalFunbJXBlnOy9xF5whrPi z/TbbA2MDRxdjJwcEgImEo9vvWCFsMUkLtxbz9bFyMUhJLCUUWLGwkvMXYwcYEUnT0hBxBcx SjQcPsgK4bQySdy69JoNpJtNQEdi/5LfYJNEBCwlHmz9zQxiMwPFl/69zAJiCwv4SUy684gd xGYRUJWY8HAnE4jNK+Amsab9AAvEFQoSC+69BbtCQuAxm0TjjxNQDQIS3yYfYoG4SFZi0wFm iHpJiYMrbrBMYBRcwMiwilE0tSC5oDgpvchUrzgxt7g0L10vOT93EyMwDE//ezZxB+P9A9aH GJOBxk1klhJNzgeGcV5JvKGxmZGFqYmpsZG5pRlpwkrivOmPkoKEBNITS1KzU1MLUovii0pz UosPMTJxcEo1MMYozPTRfVO1fML1/gCbDbdUvCpPTFpcwTv5X2jFlUklG+I3zf1b8Pja9R3s sRM+Rjxekl50K//p0egdJYca+Z2etnKeM181//RZBeE6zuxUt46fgdPktT8WxSd4TE7yve5h up452St9us+XMA+RgLj+oI/L7l/5+ERj3968qTdE3Je+b+fq8lViKc5INNRiLipOBADCUXbS WQIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRmVeSWpSXmKPExsVy+t9jAV0XqYNBBnu3i1j0njvJZHHl63s2 i0n3J7BYzJj8ks2BxWP7twesHve7jzN59G1ZxRjAHNXAaJORmpiSWqSQmpecn5KZl26r5B0c 7xxvamZgqGtoaWGupJCXmJtqq+TiE6DrlpkDtE9JoSwxpxQoFJBYXKykb4dpQmiIm64FTGOE rm9IEFyPkQEaSFjDmHGy9xJ7wRnOij/Tb7M1MDZwdDFycEgImEicPCHVxcgJZIpJXLi3nq2L kYtDSGARo0TD4YOsEE4rk8StS6/ZQKrYBHQk9i/5zQpiiwhYSjzY+psZxGYGii/9e5kFxBYW 8JOYdOcRO4jNIqAqMeHhTiYQm1fATWJN+wEWiG0KEgvuvWWbwMi9gJFhFaNoakFyQXFSeq6R XnFibnFpXrpecn7uJkZwkD+T3sG4qsHiEKMAB6MSD2/AjQNBQqyJZcWVuYcYJTiYlUR453wF CvGmJFZWpRblxxeV5qQWH2JMBto+kVlKNDkfGIF5JfGGxiZmRpZG5oYWRsbmpAkrifMebLUO FBJITyxJzU5NLUgtgtnCxMEp1cCY7zWx5Y7x7se18etYXY8u6Nh2WPLulb4HL+6Vfr9mwHE2 +/bqq2Jv91gvTr6qZ+EsJ6mw+7zCwd//Ldeb/+U6pK7+luG3U0P+v//VVt5ujC8uPpt7YfLO k5OCJ8za5rtmHoMph+3/8OUyJZeTT2z0PP1IKOnIWZ6F7rkCpdcqKuWq56qx/Vh/WYmlOCPR UIu5qDgRABmilrG2AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.3 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 DRM_HZ and DRM_WAKEUP macros are removed, but they still remained. So this patch fixes build errors by replacing the macros. Signed-off-by: Seung-Woo Kim --- The build errors are only in drm-next branch, so this patch is based on the branch. --- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 267aca9..a20440c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -347,7 +347,7 @@ static void fimd_wait_for_vblank(struct device *dev) */ if (!wait_event_timeout(ctx->wait_vsync_queue, !atomic_read(&ctx->wait_vsync_event), - DRM_HZ/20)) + HZ/20)) DRM_DEBUG_KMS("vblank wait timed out.\n"); } @@ -706,7 +706,7 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id) /* set wait vsync event to zero and wake up queue. */ if (atomic_read(&ctx->wait_vsync_event)) { atomic_set(&ctx->wait_vsync_event, 0); - DRM_WAKEUP(&ctx->wait_vsync_queue); + wake_up(&ctx->wait_vsync_queue); } out: return IRQ_HANDLED;