From: Tian Tao <tiantao6@hisilicon.com> To: <puck.chen@hisilicon.com>, <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> Cc: <linuxarm@huawei.com> Subject: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac Date: Fri, 6 Mar 2020 11:43:00 +0800 [thread overview] Message-ID: <1583466184-7060-3-git-send-email-tiantao6@hisilicon.com> (raw) In-Reply-To: <1583466184-7060-1-git-send-email-tiantao6@hisilicon.com> code cleanup for hibmc_drv_vdac.c, no actual function changes. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Signed-off-by: Gong junjie <gongjunjie2@huawei.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 49 ++++++++---------------- 1 file changed, 16 insertions(+), 33 deletions(-) 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; 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
WARNING: multiple messages have this Message-ID (diff)
From: Tian Tao <tiantao6@hisilicon.com> To: <puck.chen@hisilicon.com>, <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> Cc: linuxarm@huawei.com Subject: [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac Date: Fri, 6 Mar 2020 11:43:00 +0800 [thread overview] Message-ID: <1583466184-7060-3-git-send-email-tiantao6@hisilicon.com> (raw) In-Reply-To: <1583466184-7060-1-git-send-email-tiantao6@hisilicon.com> code cleanup for hibmc_drv_vdac.c, no actual function changes. Signed-off-by: Tian Tao <tiantao6@hisilicon.com> Signed-off-by: Gong junjie <gongjunjie2@huawei.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 49 ++++++++---------------- 1 file changed, 16 insertions(+), 33 deletions(-) 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; 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 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-03-06 3:43 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-06 3:42 [PATCH] drm/hisilicon: Add the load and unload for hibmc_driver Tian Tao 2020-03-06 3:42 ` Tian Tao 2020-03-06 3:42 ` [PATCH] drm/hisilicon: Add the shutdown for hibmc_pci_driver Tian Tao 2020-03-06 3:42 ` Tian Tao 2020-03-06 3:58 ` 答复: " tiantao (H) 2020-03-06 3:58 ` tiantao (H) 2020-03-06 3:43 ` Tian Tao [this message] 2020-03-06 3:43 ` [PATCH] drm/hisilicon: Code cleanup for hibmc_drv_vdac Tian Tao 2020-03-06 3:59 ` 答复: " tiantao (H) 2020-03-06 3:59 ` tiantao (H) 2020-03-06 3:43 ` [PATCH 1/4] drm/hisilicon: Enforce 128-byte stride alignment to fix the hardware limitation Tian Tao 2020-03-06 3:43 ` Tian Tao 2020-04-03 2:00 ` Xinliang Liu 2020-04-03 2:00 ` Xinliang Liu 2020-03-06 3:43 ` [PATCH 2/4] drm/hisilicon: Code cleanup for hibmc_drv_vdac Tian Tao 2020-03-06 3:43 ` Tian Tao 2020-04-03 2:26 ` Xinliang Liu 2020-04-03 2:26 ` Xinliang Liu 2020-04-03 7:00 ` Thomas Zimmermann 2020-04-03 7:00 ` Thomas Zimmermann 2020-03-06 3:43 ` [PATCH 3/4] drm/hisilicon: Add the load and unload for hibmc_driver Tian Tao 2020-03-06 3:43 ` Tian Tao 2020-03-06 3:43 ` [PATCH 4/4] drm/hisilicon: Add the shutdown for hibmc_pci_driver Tian Tao 2020-03-06 3:43 ` Tian Tao 2020-03-06 3:59 ` 答复: [PATCH] drm/hisilicon: Add the load and unload for hibmc_driver tiantao (H) 2020-03-06 3:59 ` tiantao (H) 2020-03-06 7:24 ` Thomas Zimmermann 2020-03-06 7:24 ` Thomas Zimmermann 2020-03-06 9:11 ` kbuild test robot 2020-03-06 9:11 ` kbuild test robot 2020-03-06 9:11 ` kbuild test robot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1583466184-7060-3-git-send-email-tiantao6@hisilicon.com \ --to=tiantao6@hisilicon.com \ --cc=airlied@linux.ie \ --cc=alexander.deucher@amd.com \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxarm@huawei.com \ --cc=puck.chen@hisilicon.com \ --cc=tglx@linutronix.de \ --cc=tzimmermann@suse.de \ --cc=xinliang.liu@linaro.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.