From patchwork Tue Jun 7 15:26:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 9161659 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 3DA5C60571 for ; Tue, 7 Jun 2016 15:26:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 30121264F4 for ; Tue, 7 Jun 2016 15:26:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 24A652723E; Tue, 7 Jun 2016 15:26:54 +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 DF35D264F4 for ; Tue, 7 Jun 2016 15:26:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D9BE36E7E8; Tue, 7 Jun 2016 15:26:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71E526E7DE; Tue, 7 Jun 2016 15:26:42 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id m124so23993768wme.3; Tue, 07 Jun 2016 08:26:42 -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=dcpzm7T29LePseLbJHuQt1Fh1cVlXg1oAZS0QCMXImk=; b=DxNjYPlUQO3crNyBwbomWd38IKP3p00isVJvvibPWJb6cNDiCHDZhuHs6QlNxqudAQ M/C6L4OhqpCZUhxk8g+hqT0sOyGL5SiAySuv4Fyh36J7K4n6dcdbyKvYRi3O2CIGFm4A KaaAlT0JKZW9VvoD6xvo4Bqw50ulH+T3jgBzGt5ISlf5y6XNLmHuzKfFTiisLZAQ60J/ Jgr9rPMDROf2kIypF4NCPag6PXKHnN8x8PTtPGEg5H8q62FCy9LXflcTrUzsNVnh+/HQ /xkdOM+TS9m+hHTq3getEY2xi1aMBFbobDRds3mlZnDq4K+6cJ81xf6g5xscSD4mHNGs C6xg== 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=dcpzm7T29LePseLbJHuQt1Fh1cVlXg1oAZS0QCMXImk=; b=hPSg+E/sxf4X3qdapmvx06AY6cRk5tdfRkLT8OTPFvkVLf33pWAJZnReLUB8QSKdPl WNHu4Icpgt4aaGIBmHkhcT6jONyEUfDsFxI5gRU1VNGEKLQf+UALdWRhQJPxUEJq3iYG giJlYk5iBIBPenr0XXP6NxGKZpnoKSOSBtSEdoql/R6pTbNJz85ACOTa0zo9sZOSQKOO IjTKaksIkIss1vg+zqfURoV+pXbE8IlpdQ//XX0o1A9Oj/xrZDGMVNu0yLQBWh93jgUg EfJzsT0nPFFxSivG16sabehvOXIiXK0n+4EgKAIhw3yqIaoFNn+zpfVXPhTQdmjqctSE f/Qw== X-Gm-Message-State: ALyK8tKLw9MKyH9EPKiCg+FBhDlp1CUdlLrqlJ3HE9piO5m8giTuzZcQhs9JtMMN59KdmA== X-Received: by 10.28.19.71 with SMTP id 68mr3247123wmt.61.1465313200562; Tue, 07 Jun 2016 08:26:40 -0700 (PDT) Received: from localhost (port-9435.pppoe.wtnet.de. [84.46.36.255]) by smtp.gmail.com with ESMTPSA id q7sm17314359wmd.3.2016.06.07.08.26.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 08:26:39 -0700 (PDT) From: Thierry Reding To: Daniel Vetter Date: Tue, 7 Jun 2016 17:26:23 +0200 Message-Id: <20160607152625.9511-8-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 7/9] drm/atmel-hlcdc: 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/atmel-hlcdc/atmel_hlcdc_dc.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 8ded7645747e..a8a855910885 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -431,15 +431,7 @@ static void atmel_hlcdc_fb_output_poll_changed(struct drm_device *dev) { struct atmel_hlcdc_dc *dc = dev->dev_private; - if (dc->fbdev) { - drm_fbdev_cma_hotplug_event(dc->fbdev); - } else { - dc->fbdev = drm_fbdev_cma_init(dev, 24, - dev->mode_config.num_crtc, - dev->mode_config.num_connector); - if (IS_ERR(dc->fbdev)) - dc->fbdev = NULL; - } + drm_fbdev_cma_hotplug_event(dc->fbdev); } struct atmel_hlcdc_dc_commit { @@ -654,11 +646,23 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) drm_kms_helper_poll_init(dev); - /* force connectors detection */ - drm_helper_hpd_irq_event(dev); + dc->fbdev = drm_fbdev_cma_init(dev, 24, dev->mode_config.num_crtc, + dev->mode_config.num_connector); + if (IS_ERR(dc->fbdev)) { + dev_err(dev->dev, "failed to setup fbdev\n"); + ret = PTR_ERR(dc->fbdev); + goto err_cleanup_poll; + } return 0; +err_cleanup_poll: + drm_kms_helper_poll_fini(dev); + + pm_runtime_get_sync(dev->dev); + drm_irq_uninstall(dev); + pm_runtime_put_sync(dev->dev); + err_periph_clk_disable: pm_runtime_disable(dev->dev); clk_disable_unprepare(dc->hlcdc->periph_clk);