From patchwork Fri Mar 6 03:59:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tian Tao X-Patchwork-Id: 11423295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DBB321395 for ; Fri, 6 Mar 2020 08:03:17 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3B522073D for ; Fri, 6 Mar 2020 08:03:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3B522073D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F30C6EC70; Fri, 6 Mar 2020 08:03:04 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from huawei.com (szxga02-in.huawei.com [45.249.212.188]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4F4F6EC5F for ; Fri, 6 Mar 2020 04:17:35 +0000 (UTC) Received: from DGGEMM402-HUB.china.huawei.com (unknown [172.30.72.55]) by Forcepoint Email with ESMTP id C0E65126F8CD98FD0DC4; Fri, 6 Mar 2020 11:59:58 +0800 (CST) Received: from dggeme712-chm.china.huawei.com (10.1.199.108) by DGGEMM402-HUB.china.huawei.com (10.3.20.210) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 6 Mar 2020 11:59:58 +0800 Received: from dggeme759-chm.china.huawei.com (10.3.19.105) by dggeme712-chm.china.huawei.com (10.1.199.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 6 Mar 2020 11:59:57 +0800 Received: from dggeme759-chm.china.huawei.com ([10.7.64.73]) by dggeme759-chm.china.huawei.com ([10.7.64.73]) with mapi id 15.01.1713.004; Fri, 6 Mar 2020 11:59:58 +0800 From: "tiantao (H)" To: "tiantao (H)" , "Chenfeng (puck)" , "airlied@linux.ie" , "daniel@ffwll.ch" , "tzimmermann@suse.de" , "kraxel@redhat.com" , "alexander.deucher@amd.com" , "tglx@linutronix.de" , "dri-devel@lists.freedesktop.org" , "xinliang.liu@linaro.org" , "linux-kernel@vger.kernel.org" Subject: =?eucgb2312_cn?b?tPC4tDogW1BBVENIXSBkcm0vaGlzaWxpY29uOiBDb2RlIGNsZWFudXAg?= =?eucgb2312_cn?b?Zm9yIGhpYm1jX2Rydl92ZGFj?= Thread-Topic: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac Thread-Index: AQHV82l0rH8iwdUyDEm3ey4ityyBS6g68H7A Date: Fri, 6 Mar 2020 03:59:58 +0000 Message-ID: References: <1583466184-7060-1-git-send-email-tiantao6@hisilicon.com> <1583466184-7060-3-git-send-email-tiantao6@hisilicon.com> In-Reply-To: <1583466184-7060-3-git-send-email-tiantao6@hisilicon.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.57.60.129] MIME-Version: 1.0 X-CFilter-Loop: Reflected X-Mailman-Approved-At: Fri, 06 Mar 2020 08:03:01 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linuxarm Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi All： Sorry，please ignore this patch. Best -----邮件原件----- 发件人: Linuxarm [mailto:linuxarm-bounces@huawei.com] 代表 Tian Tao 发送时间: 2020年3月6日 11:43 收件人: Chenfeng (puck) ; airlied@linux.ie; daniel@ffwll.ch; tzimmermann@suse.de; kraxel@redhat.com; alexander.deucher@amd.com; tglx@linutronix.de; dri-devel@lists.freedesktop.org; xinliang.liu@linaro.org; linux-kernel@vger.kernel.org 抄送: Linuxarm 主题: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac code cleanup for hibmc_drv_vdac.c, no actual function changes. Signed-off-by: Tian Tao Signed-off-by: Gong junjie --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 49 ++++++++---------------- 1 file changed, 16 insertions(+), 33 deletions(-) int ret; - connector = hibmc_connector_init(priv); - if (IS_ERR(connector)) { - DRM_ERROR("failed to create connector: %ld\n", - PTR_ERR(connector)); - return PTR_ERR(connector); - } - encoder = devm_kzalloc(dev->dev, sizeof(*encoder), GFP_KERNEL); if (!encoder) { DRM_ERROR("failed to alloc memory when init encoder\n"); @@ -131,6 +98,22 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) } drm_encoder_helper_add(encoder, &hibmc_encoder_helper_funcs); + connector = devm_kzalloc(dev->dev, sizeof(*connector), GFP_KERNEL); + if (!connector) { + DRM_ERROR("failed to alloc memory when init connector\n"); + return -ENOMEM; + } + + ret = drm_connector_init(dev, connector, + &hibmc_connector_funcs, + DRM_MODE_CONNECTOR_VGA); + if (ret) { + DRM_ERROR("failed to init connector: %d\n", ret); + return ret; + } + + drm_connector_helper_add(connector, &hibmc_connector_helper_funcs); + drm_connector_register(connector); drm_connector_attach_encoder(connector, encoder); return 0; -- 2.7.4 diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c index 678ac2e..f0e6bb8 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c @@ -52,32 +52,6 @@ static const struct drm_connector_funcs hibmc_connector_funcs = { .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, }; -static struct drm_connector * -hibmc_connector_init(struct hibmc_drm_private *priv) -{ - struct drm_device *dev = priv->dev; - struct drm_connector *connector; - int ret; - - connector = devm_kzalloc(dev->dev, sizeof(*connector), GFP_KERNEL); - if (!connector) { - DRM_ERROR("failed to alloc memory when init connector\n"); - return ERR_PTR(-ENOMEM); - } - - ret = drm_connector_init(dev, connector, - &hibmc_connector_funcs, - DRM_MODE_CONNECTOR_VGA); - if (ret) { - DRM_ERROR("failed to init connector: %d\n", ret); - return ERR_PTR(ret); - } - drm_connector_helper_add(connector, - &hibmc_connector_helper_funcs); - - return connector; -} - static void hibmc_encoder_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, struct drm_display_mode *adj_mode) @@ -109,13 +83,6 @@ int hibmc_vdac_init(struct hibmc_drm_private *priv) struct drm_connector *connector;