Skip to content

Commit 5c786f1

Browse files
Rodrigo Siqueiraalexdeucher
authored andcommitted
drm/amd/display: Reorganize dwb header
This commit makes some small adjustments in the dwb header. Acked-by: Hamza Mahfooz <[email protected]> Signed-off-by: Rodrigo Siqueira <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 4135899 commit 5c786f1

File tree

1 file changed

+19
-11
lines changed
  • drivers/gpu/drm/amd/display/dc/inc/hw

1 file changed

+19
-11
lines changed

drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,10 @@ struct dwb_caps {
147147
unsigned int support_ogam :1;
148148
unsigned int support_wbscl :1;
149149
unsigned int support_ocsc :1;
150-
unsigned int support_stereo :1;
150+
unsigned int support_stereo :1;
151+
unsigned int support_4k_120p :1;
151152
} caps;
152-
unsigned int reserved2[9]; /* Reserved for future use, MUST BE 0. */
153+
unsigned int reserved2[10]; /* Reserved for future use, MUST BE 0. */
153154
};
154155

155156
struct dwbc {
@@ -166,8 +167,9 @@ struct dwbc {
166167
bool dwb_is_drc;
167168
int wb_src_plane_inst;/*hubp, mpcc, inst*/
168169
uint32_t mask_id;
169-
int otg_inst;
170-
bool mvc_cfg;
170+
int otg_inst;
171+
bool mvc_cfg;
172+
struct dc_dwb_params params;
171173
};
172174

173175
struct dwbc_funcs {
@@ -192,6 +194,10 @@ struct dwbc_funcs {
192194
struct dwbc *dwbc,
193195
enum dwb_frame_capture_enable enable);
194196

197+
void (*dwb_set_scaler)(
198+
struct dwbc *dwbc,
199+
struct dc_dwb_params *params);
200+
195201
void (*set_stereo)(
196202
struct dwbc *dwbc,
197203
struct dwb_stereo_params *stereo_params);
@@ -205,9 +211,11 @@ struct dwbc_funcs {
205211
struct dwbc *dwbc,
206212
struct dwb_warmup_params *warmup_params);
207213

208-
214+
bool (*dwb_get_mcifbuf_line)(
215+
struct dwbc *dwbc, unsigned int *buf_idx,
216+
unsigned int *cur_line,
217+
unsigned int *over_run);
209218
#if defined(CONFIG_DRM_AMD_DC_FP)
210-
211219
void (*dwb_program_output_csc)(
212220
struct dwbc *dwbc,
213221
enum dc_color_space color_space,
@@ -216,17 +224,17 @@ struct dwbc_funcs {
216224
bool (*dwb_ogam_set_output_transfer_func)(
217225
struct dwbc *dwbc,
218226
const struct dc_transfer_func *in_transfer_func_dwb_ogam);
219-
227+
#endif
220228
//TODO: merge with output_transfer_func?
221229
bool (*dwb_ogam_set_input_transfer_func)(
222230
struct dwbc *dwbc,
223231
const struct dc_transfer_func *in_transfer_func_dwb_ogam);
224-
#endif
232+
233+
void (*get_drr_time_stamp)(
234+
struct dwbc *dwbc, uint32_t *time_stamp);
235+
225236
bool (*get_dwb_status)(
226237
struct dwbc *dwbc);
227-
void (*dwb_set_scaler)(
228-
struct dwbc *dwbc,
229-
struct dc_dwb_params *params);
230238
};
231239

232240
#endif

0 commit comments

Comments
 (0)