From patchwork Tue Mar 21 08:13:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 9636181 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 2D20D602CC for ; Tue, 21 Mar 2017 08:14:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1CFBE1FF8F for ; Tue, 21 Mar 2017 08:14:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 11EE127F07; Tue, 21 Mar 2017 08:14:44 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AA7351FF8F for ; Tue, 21 Mar 2017 08:14:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D73D86E2BE; Tue, 21 Mar 2017 08:14:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 123EA6E227; Tue, 21 Mar 2017 08:14:10 +0000 (UTC) Received: by mail-wr0-x243.google.com with SMTP id l37so21314676wrc.3; Tue, 21 Mar 2017 01:14:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vGZIZoOJRuVRIKzsMq8RxZocEXXuW4/xiGv8PnDRUF8=; b=JZaC4Mfy4gXRXcfi3AajSRs5HR7Qg6IuBHRIzMhLkXXTEoi2SWcC7ozxy7lRT+SDZ+ hrsXlk7xwnmQE2yl4FBDvJSphxT5zGKtWSpXBbStag/C8fEEgwckvnq2aYIqMAUBhanl 1vI1h88w4/fqSFhdKKq06ThNcaTDs1ZUZVIp8SHT/uYSR8QZdtytWzBawXJ/wsSwSH6B Y2/SdlAvzSOZESVZV9Q3jKYtk50u3oKfCW1AdwgZENe0v1fdFI6qRuzdca2xLJxO3Lgv zS/pIentBpw+QrxDUFZx85QOaaWBiH4Y/28MDoBKYvhrUYUxuPGDQe2xhlwZQbX0UlT8 Eqsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vGZIZoOJRuVRIKzsMq8RxZocEXXuW4/xiGv8PnDRUF8=; b=cUnClO7Wnluh6gpn7HvLq6w+PDb/8VtAQWch5QkkBWnAPy8vvbvmvZyJ/OXK9qaxfd kqp4v4cbhHKf7QrSfJJ8sIo/KgyZWD7+V8l0YKxQTQ20Bhoh4NT91XtnLFiQkonDQaPM Jq1iNCehojiLRoRkabfa0mQusD1WfpEFcialLRB2Z3oDcYnHakI5BydSOtg/cWz/MwBA A/S/5xxWhuwY11MXkXVhHVt8m52AoIsub0ao1Ug05A4Bf3UAGnXRxAaXrB5vc2XUpqDU rX2f7D2e5z/8+0iMSCzvabkRMwO4H/OZb0UeHJ3E8AP2iRpfGrcBv90PcUIihlaCVy9C 0DLg== X-Gm-Message-State: AFeK/H1sZ3CGIq7mCymt8rXff0KqtGK1BjJ/bec8Mw6MM82NOXUXtv01xkWADD7Po9hTnw== X-Received: by 10.223.152.215 with SMTP id w81mr32441634wrb.151.1490084048674; Tue, 21 Mar 2017 01:14:08 -0700 (PDT) Received: from localhost (port-52488.pppoe.wtnet.de. [46.59.205.174]) by smtp.gmail.com with ESMTPSA id m186sm16541594wmd.21.2017.03.21.01.14.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Mar 2017 01:14:07 -0700 (PDT) From: Thierry Reding To: Daniel Vetter Date: Tue, 21 Mar 2017 09:13:55 +0100 Message-Id: <20170321081358.27237-8-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170321081358.27237-1-thierry.reding@gmail.com> References: <20170321081358.27237-1-thierry.reding@gmail.com> Cc: John Stultz , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH v3 07/10] 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 | 6 ++++-- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 09d3c4c3c858..c5a37dda8d1b 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -399,8 +399,9 @@ static int exynos_drm_bind(struct device *dev) /* init kms poll for handling hpd */ drm_kms_helper_poll_init(drm); - /* force connectors detection */ - drm_helper_hpd_irq_event(drm); + ret = exynos_drm_fbdev_init(dev); + if (ret) + goto err_cleanup_poll; /* register the DRM device */ ret = drm_dev_register(drm, 0); @@ -411,6 +412,7 @@ static int exynos_drm_bind(struct device *dev) err_cleanup_fbdev: exynos_drm_fbdev_fini(drm); +err_cleanup_poll: drm_kms_helper_poll_fini(drm); exynos_drm_device_subdrv_remove(drm); err_cleanup_vblank: diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 641531243e04..a020fa70c825 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -306,6 +306,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); }