Unverified Commit fe62a262 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!2925 [OLK 5.10]Fix the call trace when hibmc loaded failed 

Merge Pull Request from: @daiweizhong 
 
Fix the call trace when hibmc loaded failed
category: feature
bugzilla: #I8ICAG 
CVE: NA

[Content]
This patch fixes the call trace bug when hibmc driver loaded failed. 
 
Link:https://gitee.com/openeuler/kernel/pulls/2925

 

Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 310af008 038094fe

drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c

+22 −10
Original line number Diff line number Diff line
@@ -288,21 +288,27 @@ static int hibmc_load(struct drm_device *dev) 
	priv->dev = dev;



	ret = hibmc_hw_init(priv);

	if (ret)

		goto err;

	if (ret) {

		drm_err(dev, "failed to initialize hardware: %d\n", ret);

		goto err_alloc;

	}



	ret = hibmc_mm_init(priv);

	if (ret)

		goto err;

	if (ret) {

		drm_err(dev, "failed to initialize mm: %d\n", ret);

		goto err_hw;

	}



	ret = hibmc_kms_init(priv);

	if (ret)

		goto err;

	if (ret) {

		drm_err(dev, "failed to initialize kms: %d\n", ret);

		goto err_mm;

	}



	ret = drm_vblank_init(dev, dev->mode_config.num_crtc);

	if (ret) {

		drm_err(dev, "failed to initialize vblank: %d\n", ret);

		goto err;

		goto err_kms;

	}



	ret = pci_enable_msi(dev->pdev);
@@ -319,9 +325,15 @@ static int hibmc_load(struct drm_device *dev) 


	return 0;



err:

	hibmc_unload(dev);

	drm_err(dev, "failed to initialize drm driver: %d\n", ret);

err_kms:

	hibmc_kms_fini(priv);

err_mm:

	hibmc_mm_fini(priv);

err_hw:

	hibmc_hw_unmap(priv);

err_alloc:

	dev->dev_private = NULL;



	return ret;

}