From patchwork Tue Jun 7 15:26:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 9161665 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4283660571 for ; Tue, 7 Jun 2016 15:26:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34E3F264F4 for ; Tue, 7 Jun 2016 15:26:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29C952723E; Tue, 7 Jun 2016 15:26:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3362264F4 for ; Tue, 7 Jun 2016 15:26:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A31726E7EB; Tue, 7 Jun 2016 15:26:46 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 497216E7E7; Tue, 7 Jun 2016 15:26:44 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id r5so6918381wmr.0; Tue, 07 Jun 2016 08:26:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ft1BibUnJHxIuTPc2AQPDXY848dl95l/GdVQAmI+4nE=; b=DoTJF19ZYvG0H4R9mcH/Rdm3K4vs6lhqIzD3f1KGksl/Dn3HbqXtMs4xhL8kpaiUW3 u1BOupEt8ZhgoZQJiv76PdTTjHdHWCSJxXQw9kPWHyDfsG17uZhxJY2lvkz6uROLO1JA 2nuCSu3i8m4gBV4YTgIEvgN+g4CZh+tHwCt4x068yVOfYrLd9zs5FtiTdxDu4zkntDBi O4ZbVqy3vuXj8DpqQdnXX1PMfLMYAJcHsydKn3m/fimeuxkQBNSs2p6B2OXAe499Fn9q NWYoUCSL2C35gelSnepVH8uQpHQZvskL3M8OTdQUD+jdS/K7QlSjuJai4+rdHX44TrNu ki8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ft1BibUnJHxIuTPc2AQPDXY848dl95l/GdVQAmI+4nE=; b=LAlUrry1NOpURl340568XF9XnDmhk4EEk2qwPBLyZ/uWRw7Eu/CqPR8GCMfBt320Hr 9j9NgqFsIqYfRjI4SX3+lciZ0N14PveobM60b4YMj64il5ppnfik4dJssMuSzZE7PINC FYyR8tbo+PC9pOQ2iDwh8ekWU6VttmzjymjPC83IbOp1XVAm7zc7W2Ir/nTVAmaPlu/O 3V7o3x65MPTVKUe9/TQGqpXY//dqczxdlPXDyWED59nvZwlU4YdxYdhqbM1mvSxRPb4H 8crg6YkG8f3dOMqgnjbO0LACXRhXDgetZ1CJAepM0ZTzvYOYxradx4fYU+maQiB7L02B Q6DA== X-Gm-Message-State: ALyK8tJYSq6DR+tY3MH8f/anbsLHllYz3xO5HXwMZOlbq+6x/O2Aj59vG/El3Yq28NoHOw== X-Received: by 10.28.132.201 with SMTP id g192mr251171wmd.87.1465313202319; Tue, 07 Jun 2016 08:26:42 -0700 (PDT) Received: from localhost (port-9435.pppoe.wtnet.de. [84.46.36.255]) by smtp.gmail.com with ESMTPSA id y1sm26014215wjl.31.2016.06.07.08.26.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 08:26:41 -0700 (PDT) From: Thierry Reding To: Daniel Vetter Date: Tue, 7 Jun 2016 17:26:24 +0200 Message-Id: <20160607152625.9511-9-thierry.reding@gmail.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160607152625.9511-1-thierry.reding@gmail.com> References: <20160607152625.9511-1-thierry.reding@gmail.com> Cc: Boris Brezillon , Joonyoung Shim , Xinliang Liu , Chen Feng , intel-gfx@lists.freedesktop.org, Seung-Woo Kim , Xinwei Kong , dri-devel@lists.freedesktop.org, Inki Dae , Kyungmin Park , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= Subject: [Intel-gfx] [PATCH v2 8/9] drm/exynos: Remove custom FB helper deferred setup X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding The FB helper core now supports deferred setup, so the driver's custom implementation can be removed. Signed-off-by: Thierry Reding --- drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 ++++++-- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 2dd820e23b0c..259c2585c703 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -215,11 +215,15 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags) /* init kms poll for handling hpd */ drm_kms_helper_poll_init(dev); - /* force connectors detection */ - drm_helper_hpd_irq_event(dev); + ret = exynos_drm_fbdev_init(dev); + if (ret) + goto err_cleanup_poll; return 0; +err_cleanup_poll: + drm_kms_helper_poll_fini(dev); + exynos_drm_device_subdrv_remove(dev); err_cleanup_vblank: drm_vblank_cleanup(dev); err_unbind_all: diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 67dcd6831291..83a277946200 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -319,6 +319,4 @@ void exynos_drm_output_poll_changed(struct drm_device *dev) if (fb_helper) drm_fb_helper_hotplug_event(fb_helper); - else - exynos_drm_fbdev_init(dev); }