Move struct amdgpu_clock from monolitic header file amdgpu.h into existing amdgpu_mode.h file.
This is part of the ongoing effort to reduce the size of amdgpu.h into their own respective separate headers. Signed-off-by: Shahyan Soltani <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 18 ------------------ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 85d040184d13..8a6b6f43a320 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -368,24 +368,6 @@ bool amdgpu_read_bios(struct amdgpu_device *adev); bool amdgpu_soc15_read_bios_from_rom(struct amdgpu_device *adev, u8 *bios, u32 length_bytes); void amdgpu_bios_release(struct amdgpu_device *adev); -/* - * Clocks - */ - -#define AMDGPU_MAX_PPLL 3 - -struct amdgpu_clock { - struct amdgpu_pll ppll[AMDGPU_MAX_PPLL]; - struct amdgpu_pll spll; - struct amdgpu_pll mpll; - /* 10 Khz units */ - uint32_t default_mclk; - uint32_t default_sclk; - uint32_t default_dispclk; - uint32_t dp_extclk; - uint32_t max_pixel_clock; -}; - /* * IRQS. */ diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h index 8069fc41cc7f..f741cb407012 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h @@ -221,6 +221,20 @@ struct amdgpu_pll { uint32_t id; }; +#define AMDGPU_MAX_PPLL 3 + +struct amdgpu_clock { + struct amdgpu_pll ppll[AMDGPU_MAX_PPLL]; + struct amdgpu_pll spll; + struct amdgpu_pll mpll; + /* 10 Khz units */ + uint32_t default_mclk; + uint32_t default_sclk; + uint32_t default_dispclk; + uint32_t dp_extclk; + uint32_t max_pixel_clock; +}; + struct amdgpu_i2c_chan { struct i2c_adapter adapter; struct drm_device *dev; -- 2.54.0
