Commit 717ea76a authored by Tian Tao's avatar Tian Tao
Browse files

drm/hisilicon: Use managed VRAM-helper initialization 



updated to use drmm_vram_helper_init()

Signed-off-by: default avatarTian Tao <tiantao6@hisilicon.com>
Reviewed-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/1606964953-24309-1-git-send-email-tiantao6@hisilicon.com
parent 9f941375

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

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static int hibmc_unload(struct drm_device *dev) 


	pci_disable_msi(dev->pdev);

	hibmc_kms_fini(priv);

	hibmc_mm_fini(priv);

	dev->dev_private = NULL;

	return 0;

}

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

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ int hibmc_de_init(struct hibmc_drm_private *priv); 
int hibmc_vdac_init(struct hibmc_drm_private *priv);



int hibmc_mm_init(struct hibmc_drm_private *hibmc);

void hibmc_mm_fini(struct hibmc_drm_private *hibmc);

int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,

		      struct drm_mode_create_dumb *args);

int hibmc_ddc_create(struct drm_device *drm_dev, struct hibmc_connector *connector);

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

+3 −16
Original line number Diff line number Diff line
@@ -23,15 +23,12 @@ 


int hibmc_mm_init(struct hibmc_drm_private *hibmc)

{

	struct drm_vram_mm *vmm;

	int ret;

	struct drm_device *dev = &hibmc->dev;



	vmm = drm_vram_helper_alloc_mm(dev,

				       pci_resource_start(dev->pdev, 0),

	ret = drmm_vram_helper_init(dev, pci_resource_start(dev->pdev, 0),

				    hibmc->fb_size);

	if (IS_ERR(vmm)) {

		ret = PTR_ERR(vmm);

	if (ret) {

		drm_err(dev, "Error initializing VRAM MM; %d\n", ret);

		return ret;

	}
@@ -39,16 +36,6 @@ int hibmc_mm_init(struct hibmc_drm_private *hibmc) 
	return 0;

}



void hibmc_mm_fini(struct hibmc_drm_private *hibmc)

{

	struct drm_device *dev = &hibmc->dev;



	if (!dev->vram_mm)

		return;



	drm_vram_helper_release_mm(dev);

}



int hibmc_dumb_create(struct drm_file *file, struct drm_device *dev,

		      struct drm_mode_create_dumb *args)

{