Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux into drm...

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu.h

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index fea4ea286368853f4fa98f09ec13f14e597a84f4..f44a83ab2bf49ab948f3e54059b7331cf08489e1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1081,8 +1081,6 @@ struct amdgpu_wb {
 int amdgpu_device_wb_get(struct amdgpu_device *adev, u32 *wb);
 void amdgpu_device_wb_free(struct amdgpu_device *adev, u32 wb);
 
-void amdgpu_device_get_pcie_info(struct amdgpu_device *adev);
-
 /*
  * SDMA
  */
@@ -1395,9 +1393,7 @@ enum amd_hw_ip_block_type {
 #define HWIP_MAX_INSTANCE      6
 
 struct amd_powerplay {
-       struct cgs_device *cgs_device;
        void *pp_handle;
-       const struct amd_ip_funcs *ip_funcs;
        const struct amd_pm_funcs *pp_funcs;
 };