From patchwork Fri Mar 4 10:54:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinliang Liu X-Patchwork-Id: 63569 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1409lbc; Fri, 4 Mar 2016 02:56:28 -0800 (PST) X-Received: by 10.98.73.142 with SMTP id r14mr11102819pfi.140.1457088988526; Fri, 04 Mar 2016 02:56:28 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hg4si5103847pac.180.2016.03.04.02.56.28; Fri, 04 Mar 2016 02:56:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751294AbcCDK41 (ORCPT + 6 others); Fri, 4 Mar 2016 05:56:27 -0500 Received: from mail-pf0-f181.google.com ([209.85.192.181]:34445 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbcCDK4Z (ORCPT ); Fri, 4 Mar 2016 05:56:25 -0500 Received: by mail-pf0-f181.google.com with SMTP id 4so33696858pfd.1 for ; Fri, 04 Mar 2016 02:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lzd01ADLPNfz2a3DSkGok/wIT8+ZZSdfmmSVZq3f9ng=; b=EsFNpdDlNkuf7Ep7ID7ZD88Yqlql20mrEWrawSRnOmQ9MzY0yYSYnYoDbut6dlyZWb y4LmPYMiFV1jNek+7cFroXXjm6KQ+ilMY73YAXCwq+iirLB8w8gkoAUP49/BlEyOCfTx j7AYZ9zroAV+h+0yn101cU4qj8BwFuvXdOH/g= 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=lzd01ADLPNfz2a3DSkGok/wIT8+ZZSdfmmSVZq3f9ng=; b=m+/oVdRJk6if5yC+1G/1mQBnNNuIdYIhXcQDZ45S7GIuS9KrqHSIL5qzudSMR6oDQ4 tXHQQBhgJC2bysSen7EznHhQshhOfadjXA9wdWOBiJvuqaHADzkczhVMbjNz97sw1XDe iUCTcjuQCBCznLKunMxBWwf/1LhSx5zW7zRO4FWB2cKg1UjXcAFVRojfnc1ikU3dtpeO dH3MtdEuKJxQrEcIv3VtxttSo1Ns6SyVn+7jA8auRS58a217aw2HXmcC0D/wmLH9DlUB IZOICOFzJskYe6VXCjG8Xor1trVDaX0cyq7oRagnmjxkuRontei34KTdj/3iVe1fEfCG 2Mqw== X-Gm-Message-State: AD7BkJLjznPhha6ygQmahQ84Z/se0bTU42DsL1qbAiqAAI6M7HadyRmrZK3NnC3uJ9Ny+bVz X-Received: by 10.98.14.156 with SMTP id 28mr11049321pfo.1.1457088985076; Fri, 04 Mar 2016 02:56:25 -0800 (PST) Received: from localhost.localdomain ([116.25.57.242]) by smtp.gmail.com with ESMTPSA id c68sm4668805pfj.41.2016.03.04.02.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 04 Mar 2016 02:56:24 -0800 (PST) From: Xinliang Liu To: dri-devel@lists.freedesktop.org, devicetree@vger.kernel.org, daniel@ffwll.ch, robh@kernel.org, daniel@fooishbar.org, architt@codeaurora.org, airlied@linux.ie, corbet@lwn.net, catalin.marinas@arm.com, will.deacon@arm.com, emil.l.velikov@gmail.com, mark.rutland@arm.com Cc: linux-doc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxarm@huawei.com, andy.green@linaro.org, haojian.zhuang@linaro.org, liguozhu@hisilicon.com, xuwei5@hisilicon.com, w.f@huawei.com, puck.chen@hisilicon.com, bintian.wang@huawei.com, benjamin.gaignard@linaro.org, xuyiping@hisilicon.com, kong.kongxinwei@hisilicon.com, zourongrong@huawei.com, lijianhua@huawei.com, sumit.semwal@linaro.org, guodong.xu@linaro.org, Xinliang Liu Subject: [PATCH v7 06/11] drm/hisilicon: Add cma fbdev and hotplug Date: Fri, 4 Mar 2016 18:54:32 +0800 Message-Id: <1457088877-131022-7-git-send-email-xinliang.liu@linaro.org> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1457088877-131022-1-git-send-email-xinliang.liu@linaro.org> References: <1457088877-131022-1-git-send-email-xinliang.liu@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add cma Fbdev, Fbdev is legency and optional, you can enable/disable it by configuring DRM_FBDEV_EMULATION. Add hotplug. v7: None. v6: None. v5: None. v4: None. v3: None. v2: - Use CONFIG_DRM_FBDEV_EMULATION instead of CONFIG_DRM_HISI_FBDEV. Signed-off-by: Xinliang Liu Signed-off-by: Xinwei Kong --- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 34 +++++++++++++++++++++++++ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 3 +++ 2 files changed, 37 insertions(+) -- 2.7.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 2a899c5bb14e..e102c9e1e7b2 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "kirin_drm_drv.h" @@ -32,6 +33,13 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) { struct kirin_drm_private *priv = dev->dev_private; +#ifdef CONFIG_DRM_FBDEV_EMULATION + if (priv->fbdev) { + drm_fbdev_cma_fini(priv->fbdev); + priv->fbdev = NULL; + } +#endif + drm_kms_helper_poll_fini(dev); drm_vblank_cleanup(dev); dc_ops->cleanup(dev); drm_mode_config_cleanup(dev); @@ -41,8 +49,28 @@ static int kirin_drm_kms_cleanup(struct drm_device *dev) return 0; } +#ifdef CONFIG_DRM_FBDEV_EMULATION +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_crtc, + dev->mode_config.num_connector); + if (IS_ERR(priv->fbdev)) + priv->fbdev = NULL; + } +} +#endif + static const struct drm_mode_config_funcs kirin_drm_mode_config_funcs = { .fb_create = drm_fb_cma_create, +#ifdef CONFIG_DRM_FBDEV_EMULATION + .output_poll_changed = kirin_fbdev_output_poll_changed, +#endif .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, }; @@ -98,6 +126,12 @@ static int kirin_drm_kms_init(struct drm_device *dev) /* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset(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); + return 0; err_unbind_all: diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h index 5a05ad6a81db..1a07caf8e7f4 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h @@ -21,6 +21,9 @@ struct kirin_dc_ops { struct kirin_drm_private { struct drm_crtc *crtc[MAX_CRTC]; +#ifdef CONFIG_DRM_FBDEV_EMULATION + struct drm_fbdev_cma *fbdev; +#endif }; extern const struct kirin_dc_ops ade_dc_ops;