From patchwork Thu Sep 18 08:50:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 4929971 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 073DFBEEA5 for ; Thu, 18 Sep 2014 08:50:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BAE5F201B9 for ; Thu, 18 Sep 2014 08:50:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B2F852017D for ; Thu, 18 Sep 2014 08:50:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00F376E5EA; Thu, 18 Sep 2014 01:50:40 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by gabe.freedesktop.org (Postfix) with ESMTP id 4AEB56E5EA for ; Thu, 18 Sep 2014 01:50:38 -0700 (PDT) Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NC300K7Q9WBLJ00@mailout4.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 18 Sep 2014 17:50:35 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 2D.A8.04467.BDC9A145; Thu, 18 Sep 2014 17:50:35 +0900 (KST) X-AuditID: cbfee68f-f797f6d000001173-47-541a9cdb40bb Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9A.56.05196.BDC9A145; Thu, 18 Sep 2014 17:50:35 +0900 (KST) Received: from localhost.localdomain ([10.88.100.151]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NC300CQN9WBC550@mmp2.samsung.com>; Thu, 18 Sep 2014 17:50:35 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: factor out initial setting of each driver Date: Thu, 18 Sep 2014 17:50:35 +0900 Message-id: <1411030235-18130-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsWyRsSkUPf2HKkQg7+PTCyufH3PZjHp/gQW ixmTX7I5MHvc7z7O5NG3ZRVjAFMUl01Kak5mWWqRvl0CV8bHNefZC65KV8xdc4q5gfGyWBcj J4eEgInE61uvmSFsMYkL99azdTFycQgJLGWU6Nv6mL2LkQOs6ON/L4j4dEaJ1csvskM4bUwS k3t+sIF0swnoSdzZdpwJxBYRUJb4O3EVI4jNLGAgcWjONBYQW1jATeL/vktgcRYBVYnZzZvB enkF3CUe/lvADnGFnMTJY5NZQRZICFxmk3je+IkdokFA4tvkQywQF8lKbDoAdbWkxMEVN1gm MAouYGRYxSiaWpBcUJyUXmSsV5yYW1yal66XnJ+7iREYcqf/PevfwXj3gPUhRgEORiUe3gO8 UiFCrIllxZW5hxhNgTZMZJYSTc4HBnZeSbyhsZmRhamJqbGRuaWZkjjvQqmfwUIC6Yklqdmp qQWpRfFFpTmpxYcYmTg4pRoYU5pWq55IigiL+PDW9Z7/O+kKb/G4J28mX2dU4JgeNjdSVKf7 /MX+8/lymnysDt/VrFMMn9wMEv0/zeJ+wgnLd/ZVTyZybJB8p6+ey8F7Tom7Y/3qyYe764vq eBMXrleW/Xzm+Q11VwbRG2fcwh88aGyY1Rsr42zTwZn0VfxP5nzhN+ZTPc4osRRnJBpqMRcV JwIAWCMRdTQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNLMWRmVeSWpSXmKPExsVy+t9jQd3bc6RCDF4u1bW48vU9m8Wk+xNY LGZMfsnmwOxxv/s4k0ffllWMAUxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW 5koKeYm5qbZKLj4Bum6ZOUBblBTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGE NYwZH9ecZy+4Kl0xd80p5gbGy2JdjBwcEgImEh//e3UxcgKZYhIX7q1n62Lk4hASmM4osXr5 RXYIp41JYnLPDzaQKjYBPYk7244zgdgiAsoSfyeuYgSxmQUMJA7NmcYCYgsLuEn833cJLM4i oCoxu3kzWC+vgLvEw38L2CG2yUmcPDaZdQIj9wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5 uZsYwQH9THoH46oGi0OMAhyMSjy8B3ilQoRYE8uKK3MPMUpwMCuJ8JZPAwrxpiRWVqUW5ccX leakFh9iNAXaPpFZSjQ5HxhteSXxhsYmZkaWRuaGFkbG5krivAdbrQOFBNITS1KzU1MLUotg +pg4OKUaGGfXcfXIpVVNfbXJ/41iycKf4qvLp/15Oj3L1M3tU0GYnKGP+xFFb0Udhx7J3Xci QhdF/38eujKjfva5mQIpR33j17yb36j5UX2yRc1MSZc1tSddV3p8ObmHveJH6XLrjAChk08F Fr5OytddMH+H/bf9s/8pcautqflkJP9CWuz/tS9HfmtPT1BiKc5INNRiLipOBAA28qOXfgIA AA== 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.15 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.8 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 From fimd driver and vidi driver, dev->irq_enabled and dev->vblank_disable_allowed are set and also mixer needs them even if missed. It's duplicated so set them when loads drm driver. Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 17 +++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 17 ----------------- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 17 ----------------- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 0d74e9b..bc87be3 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -116,6 +116,23 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) /* force connectors detection */ drm_helper_hpd_irq_event(dev); + /* + * enable drm irq mode. + * - with irq_enabled = true, we can use the vblank feature. + * + * P.S. note that we wouldn't use drm irq handler but + * just specific driver own one instead because + * drm framework supports only one irq handler. + */ + dev->irq_enabled = true; + + /* + * with vblank_disable_allowed = true, vblank interrupt will be disabled + * by drm timer once a current process gives up ownership of + * vblank event.(after drm_vblank_put function is called) + */ + dev->vblank_disable_allowed = true; + return 0; err_unbind_all: diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c index 5d09e33..370abdc 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c @@ -237,23 +237,6 @@ static int fimd_mgr_initialize(struct exynos_drm_manager *mgr, mgr->drm_dev = ctx->drm_dev = drm_dev; mgr->pipe = ctx->pipe = priv->pipe++; - /* - * enable drm irq mode. - * - with irq_enabled = true, we can use the vblank feature. - * - * P.S. note that we wouldn't use drm irq handler but - * just specific driver own one instead because - * drm framework supports only one irq handler. - */ - drm_dev->irq_enabled = true; - - /* - * with vblank_disable_allowed = true, vblank interrupt will be disabled - * by drm timer once a current process gives up ownership of - * vblank event.(after drm_vblank_put function is called) - */ - drm_dev->vblank_disable_allowed = true; - /* attach this sub driver to iommu mapping if supported. */ if (is_drm_iommu_supported(ctx->drm_dev)) { /* diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c index 9528d81..2e6120b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c +++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c @@ -303,23 +303,6 @@ static int vidi_mgr_initialize(struct exynos_drm_manager *mgr, mgr->drm_dev = ctx->drm_dev = drm_dev; mgr->pipe = ctx->pipe = priv->pipe++; - /* - * enable drm irq mode. - * - with irq_enabled = 1, we can use the vblank feature. - * - * P.S. note that we wouldn't use drm irq handler but - * just specific driver own one instead because - * drm framework supports only one irq handler. - */ - drm_dev->irq_enabled = 1; - - /* - * with vblank_disable_allowed = 1, vblank interrupt will be disabled - * by drm timer once a current process gives up ownership of - * vblank event.(after drm_vblank_put function is called) - */ - drm_dev->vblank_disable_allowed = 1; - return 0; }