Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / drivers / gpu / drm / amd / powerplay / hwmgr / hwmgr_ppt.h

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
index 2930a3355948990c56961f7f52dc424e6b65d8c1..c0193e09d58a4de840347889735f3997d2f20de8 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h
@@ -30,15 +30,17 @@
 
 struct phm_ppt_v1_clock_voltage_dependency_record {
        uint32_t clk;
-       uint8_t vddInd;
+       uint8_t  vddInd;
+       uint8_t  vddciInd;
+       uint8_t  mvddInd;
        uint16_t vdd_offset;
        uint16_t vddc;
        uint16_t vddgfx;
        uint16_t vddci;
        uint16_t mvdd;
-       uint8_t phases;
-       uint8_t cks_enable;
-       uint8_t cks_voffset;
+       uint8_t  phases;
+       uint8_t  cks_enable;
+       uint8_t  cks_voffset;
        uint32_t sclk_offset;
 };
 
@@ -94,6 +96,7 @@ struct phm_ppt_v1_pcie_record {
        uint8_t gen_speed;
        uint8_t lane_width;
        uint16_t usreserved;
+       uint16_t reserved;
        uint32_t pcie_sclk;
 };
 typedef struct phm_ppt_v1_pcie_record phm_ppt_v1_pcie_record;
@@ -104,5 +107,10 @@ struct phm_ppt_v1_pcie_table {
 };
 typedef struct phm_ppt_v1_pcie_table phm_ppt_v1_pcie_table;
 
+struct phm_ppt_v1_gpio_table {
+       uint8_t vrhot_triggered_sclk_dpm_index;           /* SCLK DPM level index to switch to when VRHot is triggered */
+};
+typedef struct phm_ppt_v1_gpio_table phm_ppt_v1_gpio_table;
+
 #endif