| .. | .. |
|---|
| 229 | 229 | static void program_size_and_rotation( |
|---|
| 230 | 230 | struct dce_mem_input *mem_input110, |
|---|
| 231 | 231 | enum dc_rotation_angle rotation, |
|---|
| 232 | | - const union plane_size *plane_size) |
|---|
| 232 | + const struct plane_size *plane_size) |
|---|
| 233 | 233 | { |
|---|
| 234 | 234 | uint32_t value = 0; |
|---|
| 235 | | - union plane_size local_size = *plane_size; |
|---|
| 235 | + struct plane_size local_size = *plane_size; |
|---|
| 236 | 236 | |
|---|
| 237 | 237 | if (rotation == ROTATION_ANGLE_90 || |
|---|
| 238 | 238 | rotation == ROTATION_ANGLE_270) { |
|---|
| 239 | 239 | |
|---|
| 240 | | - swap(local_size.video.luma_size.x, |
|---|
| 241 | | - local_size.video.luma_size.y); |
|---|
| 242 | | - swap(local_size.video.luma_size.width, |
|---|
| 243 | | - local_size.video.luma_size.height); |
|---|
| 244 | | - swap(local_size.video.chroma_size.x, |
|---|
| 245 | | - local_size.video.chroma_size.y); |
|---|
| 246 | | - swap(local_size.video.chroma_size.width, |
|---|
| 247 | | - local_size.video.chroma_size.height); |
|---|
| 240 | + swap(local_size.surface_size.x, |
|---|
| 241 | + local_size.surface_size.y); |
|---|
| 242 | + swap(local_size.surface_size.width, |
|---|
| 243 | + local_size.surface_size.height); |
|---|
| 244 | + swap(local_size.chroma_size.x, |
|---|
| 245 | + local_size.chroma_size.y); |
|---|
| 246 | + swap(local_size.chroma_size.width, |
|---|
| 247 | + local_size.chroma_size.height); |
|---|
| 248 | 248 | } |
|---|
| 249 | 249 | |
|---|
| 250 | 250 | value = 0; |
|---|
| 251 | | - set_reg_field_value(value, local_size.video.luma_pitch, |
|---|
| 251 | + set_reg_field_value(value, local_size.surface_pitch, |
|---|
| 252 | 252 | UNP_GRPH_PITCH_L, GRPH_PITCH_L); |
|---|
| 253 | 253 | |
|---|
| 254 | 254 | dm_write_reg( |
|---|
| .. | .. |
|---|
| 257 | 257 | value); |
|---|
| 258 | 258 | |
|---|
| 259 | 259 | value = 0; |
|---|
| 260 | | - set_reg_field_value(value, local_size.video.chroma_pitch, |
|---|
| 260 | + set_reg_field_value(value, local_size.chroma_pitch, |
|---|
| 261 | 261 | UNP_GRPH_PITCH_C, GRPH_PITCH_C); |
|---|
| 262 | 262 | dm_write_reg( |
|---|
| 263 | 263 | mem_input110->base.ctx, |
|---|
| .. | .. |
|---|
| 297 | 297 | value); |
|---|
| 298 | 298 | |
|---|
| 299 | 299 | value = 0; |
|---|
| 300 | | - set_reg_field_value(value, local_size.video.luma_size.x + |
|---|
| 301 | | - local_size.video.luma_size.width, |
|---|
| 300 | + set_reg_field_value(value, local_size.surface_size.x + |
|---|
| 301 | + local_size.surface_size.width, |
|---|
| 302 | 302 | UNP_GRPH_X_END_L, GRPH_X_END_L); |
|---|
| 303 | 303 | dm_write_reg( |
|---|
| 304 | 304 | mem_input110->base.ctx, |
|---|
| .. | .. |
|---|
| 306 | 306 | value); |
|---|
| 307 | 307 | |
|---|
| 308 | 308 | value = 0; |
|---|
| 309 | | - set_reg_field_value(value, local_size.video.chroma_size.x + |
|---|
| 310 | | - local_size.video.chroma_size.width, |
|---|
| 309 | + set_reg_field_value(value, local_size.chroma_size.x + |
|---|
| 310 | + local_size.chroma_size.width, |
|---|
| 311 | 311 | UNP_GRPH_X_END_C, GRPH_X_END_C); |
|---|
| 312 | 312 | dm_write_reg( |
|---|
| 313 | 313 | mem_input110->base.ctx, |
|---|
| .. | .. |
|---|
| 315 | 315 | value); |
|---|
| 316 | 316 | |
|---|
| 317 | 317 | value = 0; |
|---|
| 318 | | - set_reg_field_value(value, local_size.video.luma_size.y + |
|---|
| 319 | | - local_size.video.luma_size.height, |
|---|
| 318 | + set_reg_field_value(value, local_size.surface_size.y + |
|---|
| 319 | + local_size.surface_size.height, |
|---|
| 320 | 320 | UNP_GRPH_Y_END_L, GRPH_Y_END_L); |
|---|
| 321 | 321 | dm_write_reg( |
|---|
| 322 | 322 | mem_input110->base.ctx, |
|---|
| .. | .. |
|---|
| 324 | 324 | value); |
|---|
| 325 | 325 | |
|---|
| 326 | 326 | value = 0; |
|---|
| 327 | | - set_reg_field_value(value, local_size.video.chroma_size.y + |
|---|
| 328 | | - local_size.video.chroma_size.height, |
|---|
| 327 | + set_reg_field_value(value, local_size.chroma_size.y + |
|---|
| 328 | + local_size.chroma_size.height, |
|---|
| 329 | 329 | UNP_GRPH_Y_END_C, GRPH_Y_END_C); |
|---|
| 330 | 330 | dm_write_reg( |
|---|
| 331 | 331 | mem_input110->base.ctx, |
|---|
| .. | .. |
|---|
| 637 | 637 | struct mem_input *mem_input, |
|---|
| 638 | 638 | enum surface_pixel_format format, |
|---|
| 639 | 639 | union dc_tiling_info *tiling_info, |
|---|
| 640 | | - union plane_size *plane_size, |
|---|
| 640 | + struct plane_size *plane_size, |
|---|
| 641 | 641 | enum dc_rotation_angle rotation, |
|---|
| 642 | 642 | struct dc_plane_dcc_param *dcc, |
|---|
| 643 | 643 | bool horizotal_mirror) |
|---|