Skip to content

Commit 81fc9ca

Browse files
Taimur Hassanalexdeucher
authored andcommitted
drm/amd/display: [FW Promotion] Release 0.1.11.0
Refactoring some DMUB related structs and enum. Acked-by: Wayne Lin <[email protected]> Signed-off-by: Taimur Hassan <[email protected]> Signed-off-by: Tom Chung <[email protected]> Tested-by: Daniel Wheeler <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 29e82a2 commit 81fc9ca

File tree

1 file changed

+32
-2
lines changed

1 file changed

+32
-2
lines changed

drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,6 +2139,11 @@ union dmub_cmd_fams2_config {
21392139
} stream_v1; //v1
21402140
};
21412141

2142+
struct dmub_fams2_config_v2 {
2143+
struct dmub_cmd_fams2_global_config global;
2144+
struct dmub_fams2_stream_static_state_v1 stream_v1[DMUB_MAX_STREAMS]; //v1
2145+
};
2146+
21422147
/**
21432148
* DMUB rb command definition for FAMS2 (merged SubVP, FPO, Legacy)
21442149
*/
@@ -2147,6 +2152,22 @@ struct dmub_rb_cmd_fams2 {
21472152
union dmub_cmd_fams2_config config;
21482153
};
21492154

2155+
/**
2156+
* Indirect buffer descriptor
2157+
*/
2158+
struct dmub_ib_data {
2159+
union dmub_addr src; // location of indirect buffer in memory
2160+
uint16_t size; // indirect buffer size in bytes
2161+
};
2162+
2163+
/**
2164+
* DMUB rb command definition for commands passed over indirect buffer
2165+
*/
2166+
struct dmub_rb_cmd_ib {
2167+
struct dmub_cmd_header header;
2168+
struct dmub_ib_data ib_data;
2169+
};
2170+
21502171
/**
21512172
* enum dmub_cmd_idle_opt_type - Idle optimization command type.
21522173
*/
@@ -2170,6 +2191,11 @@ enum dmub_cmd_idle_opt_type {
21702191
* DCN hardware notify power state.
21712192
*/
21722193
DMUB_CMD__IDLE_OPT_SET_DC_POWER_STATE = 3,
2194+
2195+
/**
2196+
* DCN notify to release HW.
2197+
*/
2198+
DMUB_CMD__IDLE_OPT_RELEASE_HW = 4,
21732199
};
21742200

21752201
/**
@@ -2931,8 +2957,9 @@ enum dmub_cmd_fams_type {
29312957
*/
29322958
DMUB_CMD__FAMS_SET_MANUAL_TRIGGER = 3,
29332959
DMUB_CMD__FAMS2_CONFIG = 4,
2934-
DMUB_CMD__FAMS2_DRR_UPDATE = 5,
2935-
DMUB_CMD__FAMS2_FLIP = 6,
2960+
DMUB_CMD__FAMS2_IB_CONFIG = 5,
2961+
DMUB_CMD__FAMS2_DRR_UPDATE = 6,
2962+
DMUB_CMD__FAMS2_FLIP = 7,
29362963
};
29372964

29382965
/**
@@ -5926,8 +5953,11 @@ union dmub_rb_cmd {
59265953
* Definition of a DMUB_CMD__PSP_ASSR_ENABLE command.
59275954
*/
59285955
struct dmub_rb_cmd_assr_enable assr_enable;
5956+
59295957
struct dmub_rb_cmd_fams2 fams2_config;
59305958

5959+
struct dmub_rb_cmd_ib ib_fams2_config;
5960+
59315961
struct dmub_rb_cmd_fams2_drr_update fams2_drr_update;
59325962

59335963
struct dmub_rb_cmd_fams2_flip fams2_flip;

0 commit comments

Comments
 (0)