diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3109-drm-amdgpu-Use-dev_get_drvdata-where-possible.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3109-drm-amdgpu-Use-dev_get_drvdata-where-possible.patch | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3109-drm-amdgpu-Use-dev_get_drvdata-where-possible.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3109-drm-amdgpu-Use-dev_get_drvdata-where-possible.patch new file mode 100644 index 00000000..7ccb8c65 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3109-drm-amdgpu-Use-dev_get_drvdata-where-possible.patch @@ -0,0 +1,88 @@ +From 6b00ff9d6424c84f567814e7fffa6b29c91a084a Mon Sep 17 00:00:00 2001 +From: Chuhong Yuan <hslester96@gmail.com> +Date: Tue, 23 Jul 2019 17:04:50 +0800 +Subject: [PATCH 3109/4256] drm/amdgpu: Use dev_get_drvdata where possible + +Instead of using to_pci_dev + pci_get_drvdata, +use dev_get_drvdata to make code simpler. + +Signed-off-by: Chuhong Yuan <hslester96@gmail.com> +Signed-off-by: Alex Deucher <alexander.deucher@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +++++++-------------- + 1 file changed, 7 insertions(+), 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index e7c6f9b6e4ba..1d72e2e784d0 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -1136,16 +1136,14 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) + + static int amdgpu_pmops_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 amdgpu_device_suspend(drm_dev, true, true); + } + + static int amdgpu_pmops_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); + + /* GPU comes up enabled by the bios on resume */ + if (amdgpu_device_is_px(drm_dev)) { +@@ -1159,33 +1157,29 @@ static int amdgpu_pmops_resume(struct device *dev) + + static int amdgpu_pmops_freeze(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 amdgpu_device_suspend(drm_dev, false, true); + } + + static int amdgpu_pmops_thaw(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 amdgpu_device_resume(drm_dev, false, true); + } + + static int amdgpu_pmops_poweroff(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 amdgpu_device_suspend(drm_dev, true, true); + } + + static int amdgpu_pmops_restore(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 amdgpu_device_resume(drm_dev, false, true); + } + +@@ -1244,8 +1238,7 @@ static int amdgpu_pmops_runtime_resume(struct device *dev) + + static int amdgpu_pmops_runtime_idle(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); + struct drm_crtc *crtc; + + if (!amdgpu_device_is_px(drm_dev)) { +-- +2.17.1 + |