Merge tag 'drm-hisilicon-hibmc-next-2019-08-26' of https://github.com/xin3liang/linux into drm-next (8c973fb6) · Commits · 戴 / test

drivers/gpu/drm/hisilicon/hibmc/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0-only
		config DRM_HISI_HIBMC
		tristate "DRM Support for Hisilicon Hibmc"
		depends on DRM && PCI && MMU
		depends on DRM && PCI && MMU && ARM64
		select DRM_KMS_HELPER
		select DRM_VRAM_HELPER

+3 −16

Original line number	Diff line number	Diff line
		@@ -66,16 +66,14 @@ static struct drm_driver hibmc_driver = {

		static int __maybe_unused hibmc_pm_suspend(struct device *dev)
		{
		struct pci_dev *pdev = to_pci_dev(dev);
		struct drm_device *drm_dev = pci_get_drvdata(pdev);
		struct drm_device *drm_dev = dev_get_drvdata(dev);

		return drm_mode_config_helper_suspend(drm_dev);
		}

		static int __maybe_unused hibmc_pm_resume(struct device *dev)
		{
		struct pci_dev *pdev = to_pci_dev(dev);
		struct drm_device *drm_dev = pci_get_drvdata(pdev);
		struct drm_device *drm_dev = dev_get_drvdata(dev);

		return drm_mode_config_helper_resume(drm_dev);
		}
		@@ -394,18 +392,7 @@ static struct pci_driver hibmc_pci_driver = {
		.driver.pm = &hibmc_pm_ops,
		};

		static int __init hibmc_init(void)
		{
		return pci_register_driver(&hibmc_pci_driver);
		}

		static void __exit hibmc_exit(void)
		{
		return pci_unregister_driver(&hibmc_pci_driver);
		}

		module_init(hibmc_init);
		module_exit(hibmc_exit);
		module_pci_driver(hibmc_pci_driver);

		MODULE_DEVICE_TABLE(pci, hibmc_pci_table);
		MODULE_AUTHOR("RongrongZou <zourongrong@huawei.com>");