Commit 8c973fb6 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-hisilicon-hibmc-next-2019-08-26' of https://github.com/xin3liang/linux into drm-next

Three small cleanup and fix patches for 5.4 hisilicon hibmc driver.
I have tested and verified on taishan 2280v1/v2 machines.
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: xinliang <z.liuxinliang@hisilicon.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5D63A271.7080400@hisilicon.com
parents 2467d946 feeb07d0
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config DRM_HISI_HIBMC config DRM_HISI_HIBMC
tristate "DRM Support for Hisilicon Hibmc" tristate "DRM Support for Hisilicon Hibmc"
depends on DRM && PCI && MMU depends on DRM && PCI && MMU && ARM64
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_VRAM_HELPER select DRM_VRAM_HELPER
......
...@@ -66,16 +66,14 @@ static struct drm_driver hibmc_driver = { ...@@ -66,16 +66,14 @@ static struct drm_driver hibmc_driver = {
static int __maybe_unused hibmc_pm_suspend(struct device *dev) static int __maybe_unused hibmc_pm_suspend(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = dev_get_drvdata(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev);
return drm_mode_config_helper_suspend(drm_dev); return drm_mode_config_helper_suspend(drm_dev);
} }
static int __maybe_unused hibmc_pm_resume(struct device *dev) static int __maybe_unused hibmc_pm_resume(struct device *dev)
{ {
struct pci_dev *pdev = to_pci_dev(dev); struct drm_device *drm_dev = dev_get_drvdata(dev);
struct drm_device *drm_dev = pci_get_drvdata(pdev);
return drm_mode_config_helper_resume(drm_dev); return drm_mode_config_helper_resume(drm_dev);
} }
...@@ -394,18 +392,7 @@ static struct pci_driver hibmc_pci_driver = { ...@@ -394,18 +392,7 @@ static struct pci_driver hibmc_pci_driver = {
.driver.pm = &hibmc_pm_ops, .driver.pm = &hibmc_pm_ops,
}; };
static int __init hibmc_init(void) module_pci_driver(hibmc_pci_driver);
{
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_DEVICE_TABLE(pci, hibmc_pci_table); MODULE_DEVICE_TABLE(pci, hibmc_pci_table);
MODULE_AUTHOR("RongrongZou <zourongrong@huawei.com>"); MODULE_AUTHOR("RongrongZou <zourongrong@huawei.com>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment