From patchwork Tue Jun 27 14:59:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9812207 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 8369160351 for ; Tue, 27 Jun 2017 15:01:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 765C3286BE for ; Tue, 27 Jun 2017 15:01:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AEA5286BC; Tue, 27 Jun 2017 15:01:20 +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_SIGNED, 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 27C33286BC for ; Tue, 27 Jun 2017 15:01:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 138476E41D; Tue, 27 Jun 2017 15:00:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00B586E404 for ; Tue, 27 Jun 2017 14:59:58 +0000 (UTC) Received: by mail-wm0-x243.google.com with SMTP id y5so6275012wmh.3 for ; Tue, 27 Jun 2017 07:59:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xg1KOm0OsH6aZhMIejbQmaXO/NXo8pMlDigZFDHyrug=; b=WbgGRjfcWSSpmWlcCwR1UBGeUk/F4I0uHJg+tK2zuOM4Q9Yiz1+p3NS9PlA74uyeWq 4Ms0Kx1RS30EHMzXFowZoiRQ8/v9efFee0K/R/ZYefJKseeUmg/EBYeS0zCSAuQ4pYi4 taAKJK+y0fv565WGhh1FjLUb+zDI7fYpmEgsk= 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=Xg1KOm0OsH6aZhMIejbQmaXO/NXo8pMlDigZFDHyrug=; b=gVrMQpjpAFjwR7uapPoG+hd/GmnJZ8VujK/BzgkIFJz9LwS/8PHb0SfRz3Fg1geVEj Y1+J1IeXU/LqdTtYn0nTZDZdnYY+Cf5GwMF9gJ2BSuKpPJshY8AoG8hh7Ka3pyIBm7Ay PVLZu2Il/RkTBWKFafiPKo9l8YaLXUX1VyilCAU0dWq+4uhL+xBEnSwKXlO+nn4eUuj8 7lauUZiQKRw/hXhtTeN7qH5Q/YRvzRBaQPRmH6uqhzzVOIEye/G91xLGqBojMqLQbcsc jiC53zDDMmdN9C+zM8fDbuBKLnvw6+CvtdcLFAeiIuCHiFLdVuxX1DgKBHPo6COxQiUX iVGA== X-Gm-Message-State: AKS2vOy/98oR9FSg3JjR6OP6t0NgCpp8KMjcnVH+yCZkov959kSmQYOA zumGCXgNuf5oOQtZfCI= X-Received: by 10.80.150.209 with SMTP id z17mr4233980eda.95.1498575597494; Tue, 27 Jun 2017 07:59:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:5640:0:960b:2678:e223:c1c6]) by smtp.gmail.com with ESMTPSA id x44sm1557561edx.38.2017.06.27.07.59.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jun 2017 07:59:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 12/13] drm/hisilicon: Remove custom FB helper deferred setup Date: Tue, 27 Jun 2017 16:59:35 +0200 Message-Id: <20170627145936.18983-13-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170627145936.18983-1-daniel.vetter@ffwll.ch> References: <20170627145936.18983-1-daniel.vetter@ffwll.ch> Cc: Chen Feng , Intel Graphics Development , Xinliang Liu , Xinwei Kong , Daniel Vetter , Rongrong Zou , Thierry Reding 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-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. Cc: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Reviewed-by: Daniel Vetter Signed-off-by: Thierry Reding Signed-off-by: Daniel Vetter --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 8065d6cb1d7f..da51befa8246 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -54,14 +54,7 @@ static void kirin_fbdev_output_poll_changed(struct drm_device *dev) { struct kirin_drm_private *priv = dev->dev_private; - if (priv->fbdev) { - drm_fbdev_cma_hotplug_event(priv->fbdev); - } else { - priv->fbdev = drm_fbdev_cma_init(dev, 32, - dev->mode_config.num_connector); - if (IS_ERR(priv->fbdev)) - priv->fbdev = NULL; - } + drm_fbdev_cma_hotplug_event(priv->fbdev); } #endif @@ -128,11 +121,19 @@ static int kirin_drm_kms_init(struct drm_device *dev) /* init kms poll for handling hpd */ drm_kms_helper_poll_init(dev); - /* force detection after connectors init */ - (void)drm_helper_hpd_irq_event(dev); + priv->fbdev = drm_fbdev_cma_init(dev, 32, + dev->mode_config.num_connector); + if (IS_ERR(priv->fbdev)) { + DRM_ERROR("failed to initialize fbdev.\n"); + ret = PTR_ERR(priv->fbdev); + goto err_cleanup_poll; + } return 0; +err_cleanup_poll: + drm_kms_helper_poll_fini(dev); + drm_vblank_cleanup(dev); err_unbind_all: component_unbind_all(dev->dev, dev); err_dc_cleanup: