From: Alex Deucher <alexander.deuc...@amd.com>

[ Upstream commit 49afe91370b86566857a3c2c39612cf098110885 ]

For pptable structs that use flexible array sizes, use flexible arrays.

Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2039926
Reviewed-by: Mario Limonciello <mario.limoncie...@amd.com>
Acked-by: Christian König <christian.koe...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 .../drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h |  4 ++--
 .../amd/pm/powerplay/hwmgr/vega10_pptable.h   | 24 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h 
b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
index b0ac4d121adca..5eeb49a08c997 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
@@ -367,7 +367,7 @@ typedef struct _ATOM_Tonga_VCE_State_Record {
 typedef struct _ATOM_Tonga_VCE_State_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;
-       ATOM_Tonga_VCE_State_Record entries[1];
+       ATOM_Tonga_VCE_State_Record entries[];
 } ATOM_Tonga_VCE_State_Table;
 
 typedef struct _ATOM_Tonga_PowerTune_Table {
@@ -482,7 +482,7 @@ typedef struct _ATOM_Tonga_Hard_Limit_Record {
 typedef struct _ATOM_Tonga_Hard_Limit_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;
-       ATOM_Tonga_Hard_Limit_Record entries[1];
+       ATOM_Tonga_Hard_Limit_Record entries[];
 } ATOM_Tonga_Hard_Limit_Table;
 
 typedef struct _ATOM_Tonga_GPIO_Table {
diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h 
b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
index 9c479bd9a786b..a372abcd01be6 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
+++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_pptable.h
@@ -129,7 +129,7 @@ typedef struct _ATOM_Vega10_State {
 typedef struct _ATOM_Vega10_State_Array {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                         /* Number 
of entries. */
-       ATOM_Vega10_State states[1];                             /* Dynamically 
allocate entries. */
+       ATOM_Vega10_State states[];                             /* Dynamically 
allocate entries. */
 } ATOM_Vega10_State_Array;
 
 typedef struct _ATOM_Vega10_CLK_Dependency_Record {
@@ -169,37 +169,37 @@ typedef struct _ATOM_Vega10_GFXCLK_Dependency_Table {
 typedef struct _ATOM_Vega10_MCLK_Dependency_Table {
     UCHAR ucRevId;
     UCHAR ucNumEntries;                                         /* Number of 
entries. */
-    ATOM_Vega10_MCLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+    ATOM_Vega10_MCLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_MCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_SOCCLK_Dependency_Table {
     UCHAR ucRevId;
     UCHAR ucNumEntries;                                         /* Number of 
entries. */
-    ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+    ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_SOCCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_DCEFCLK_Dependency_Table {
     UCHAR ucRevId;
     UCHAR ucNumEntries;                                         /* Number of 
entries. */
-    ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+    ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_DCEFCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_PIXCLK_Dependency_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                         /* Number 
of entries. */
-       ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+       ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_PIXCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_DISPCLK_Dependency_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                         /* Number 
of entries.*/
-       ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+       ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_DISPCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_PHYCLK_Dependency_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                         /* Number 
of entries. */
-       ATOM_Vega10_CLK_Dependency_Record entries[1];            /* Dynamically 
allocate entries. */
+       ATOM_Vega10_CLK_Dependency_Record entries[];            /* Dynamically 
allocate entries. */
 } ATOM_Vega10_PHYCLK_Dependency_Table;
 
 typedef struct _ATOM_Vega10_MM_Dependency_Record {
@@ -213,7 +213,7 @@ typedef struct _ATOM_Vega10_MM_Dependency_Record {
 typedef struct _ATOM_Vega10_MM_Dependency_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                         /* Number 
of entries */
-       ATOM_Vega10_MM_Dependency_Record entries[1];             /* Dynamically 
allocate entries */
+       ATOM_Vega10_MM_Dependency_Record entries[];             /* Dynamically 
allocate entries */
 } ATOM_Vega10_MM_Dependency_Table;
 
 typedef struct _ATOM_Vega10_PCIE_Record {
@@ -225,7 +225,7 @@ typedef struct _ATOM_Vega10_PCIE_Record {
 typedef struct _ATOM_Vega10_PCIE_Table {
        UCHAR  ucRevId;
        UCHAR  ucNumEntries;                                        /* Number 
of entries */
-       ATOM_Vega10_PCIE_Record entries[1];                      /* Dynamically 
allocate entries. */
+       ATOM_Vega10_PCIE_Record entries[];                      /* Dynamically 
allocate entries. */
 } ATOM_Vega10_PCIE_Table;
 
 typedef struct _ATOM_Vega10_Voltage_Lookup_Record {
@@ -235,7 +235,7 @@ typedef struct _ATOM_Vega10_Voltage_Lookup_Record {
 typedef struct _ATOM_Vega10_Voltage_Lookup_Table {
        UCHAR ucRevId;
        UCHAR ucNumEntries;                                          /* Number 
of entries */
-       ATOM_Vega10_Voltage_Lookup_Record entries[1];             /* 
Dynamically allocate entries */
+       ATOM_Vega10_Voltage_Lookup_Record entries[];             /* Dynamically 
allocate entries */
 } ATOM_Vega10_Voltage_Lookup_Table;
 
 typedef struct _ATOM_Vega10_Fan_Table {
@@ -329,7 +329,7 @@ typedef struct _ATOM_Vega10_VCE_State_Table
 {
     UCHAR ucRevId;
     UCHAR ucNumEntries;
-    ATOM_Vega10_VCE_State_Record entries[1];
+    ATOM_Vega10_VCE_State_Record entries[];
 } ATOM_Vega10_VCE_State_Table;
 
 typedef struct _ATOM_Vega10_PowerTune_Table {
@@ -432,7 +432,7 @@ typedef struct _ATOM_Vega10_Hard_Limit_Table
 {
     UCHAR ucRevId;
     UCHAR ucNumEntries;
-    ATOM_Vega10_Hard_Limit_Record entries[1];
+    ATOM_Vega10_Hard_Limit_Record entries[];
 } ATOM_Vega10_Hard_Limit_Table;
 
 typedef struct _Vega10_PPTable_Generic_SubTable_Header
-- 
2.42.0

Reply via email to