amd-drm-fixes-6.7-2023-12-13: amdgpu: - Fix suspend fix that got accidently mangled last week - Fix OD regression - PSR fixes - OLED Backlight regression fix - JPEG 4.0.5 fix - Misc display fixes - SDMA 5.2 fix - SDMA 2.4 regression fix - GPUVM race fix Signed-off-by: Dave Airlie <airlied@redhat.com>
Unified · Split
| @@ -4516,8 +4516,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) · 4515 unmodified lines | |||
| 4516 | 4516 | ||
| 4517 | amdgpu_ras_suspend(adev); | 4517 | amdgpu_ras_suspend(adev); |
| 4518 | 4518 | ||
| 4519 | amdgpu_ttm_set_buffer_funcs_status(adev, false); | ||
| 4520 | |||
| 4521 | amdgpu_device_ip_suspend_phase1(adev); | 4519 | amdgpu_device_ip_suspend_phase1(adev); |
| 4522 | 4520 | ||
| 4523 | if (!adev->in_s0ix) | 4521 | if (!adev->in_s0ix) |
| @@ -1343,6 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) · 1342 unmodified lines | |||
| 1343 | 1343 | ||
| 1344 | abo = ttm_to_amdgpu_bo(bo); | 1344 | abo = ttm_to_amdgpu_bo(bo); |
| 1345 | 1345 | ||
| 1346 | WARN_ON(abo->vm_bo); | ||
| 1347 | |||
| 1346 | if (abo->kfd_bo) | 1348 | if (abo->kfd_bo) |
| 1347 | amdgpu_amdkfd_release_notify(abo); | 1349 | amdgpu_amdkfd_release_notify(abo); |
| 1348 | 1350 | ||
| @@ -642,13 +642,14 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base *entry) · 641 unmodified lines | |||
| 642 | 642 | ||
| 643 | if (!entry->bo) | 643 | if (!entry->bo) |
| 644 | return; | 644 | return; |
| 645 | |||
| 646 | entry->bo->vm_bo = NULL; | ||
| 645 | shadow = amdgpu_bo_shadowed(entry->bo); | 647 | shadow = amdgpu_bo_shadowed(entry->bo); |
| 646 | if (shadow) { | 648 | if (shadow) { |
| 647 | ttm_bo_set_bulk_move(&shadow->tbo, NULL); | 649 | ttm_bo_set_bulk_move(&shadow->tbo, NULL); |
| 648 | amdgpu_bo_unref(&shadow); | 650 | amdgpu_bo_unref(&shadow); |
| 649 | } | 651 | } |
| 650 | ttm_bo_set_bulk_move(&entry->bo->tbo, NULL); | 652 | ttm_bo_set_bulk_move(&entry->bo->tbo, NULL); |
| 651 | entry->bo->vm_bo = NULL; | ||
| 652 | 653 | ||
| 653 | spin_lock(&entry->vm->status_lock); | 654 | spin_lock(&entry->vm->status_lock); |
| 654 | list_del(&entry->vm_status); | 655 | list_del(&entry->vm_status); |
| @@ -155,13 +155,6 @@ static int jpeg_v4_0_5_hw_init(void *handle) · 154 unmodified lines | |||
| 155 | struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec; | 155 | struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec; |
| 156 | int r; | 156 | int r; |
| 157 | 157 | ||
| 158 | adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell, | ||
| 159 | (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0); | ||
| 160 | |||
| 161 | WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL, | ||
| 162 | ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT | | ||
| 163 | VCN_JPEG_DB_CTRL__EN_MASK); | ||
| 164 | |||
| 165 | r = amdgpu_ring_test_helper(ring); | 158 | r = amdgpu_ring_test_helper(ring); |
| 166 | if (r) | 159 | if (r) |
| 167 | return r; | 160 | return r; |
| @@ -336,6 +329,14 @@ static int jpeg_v4_0_5_start(struct amdgpu_device *adev) · 168 unmodified lines | |||
| 336 | if (adev->pm.dpm_enabled) | 329 | if (adev->pm.dpm_enabled) |
| 337 | amdgpu_dpm_enable_jpeg(adev, true); | 330 | amdgpu_dpm_enable_jpeg(adev, true); |
| 338 | 331 | ||
| 332 | /* doorbell programming is done for every playback */ | ||
| 333 | adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell, | ||
| 334 | (adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0); | ||
| 335 | |||
| 336 | WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL, | ||
| 337 | ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT | | ||
| 338 | VCN_JPEG_DB_CTRL__EN_MASK); | ||
| 339 | |||
| 339 | /* disable power gating */ | 340 | /* disable power gating */ |
| 340 | r = jpeg_v4_0_5_disable_static_power_gating(adev); | 341 | r = jpeg_v4_0_5_disable_static_power_gating(adev); |
| 341 | if (r) | 342 | if (r) |
| @@ -813,12 +813,12 @@ static int sdma_v2_4_early_init(void *handle) · 812 unmodified lines | |||
| 813 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | 813 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| 814 | int r; | 814 | int r; |
| 815 | 815 | ||
| 816 | adev->sdma.num_instances = SDMA_MAX_INSTANCE; | ||
| 817 | |||
| 816 | r = sdma_v2_4_init_microcode(adev); | 818 | r = sdma_v2_4_init_microcode(adev); |
| 817 | if (r) | 819 | if (r) |
| 818 | return r; | 820 | return r; |
| 819 | 821 | ||
| 820 | adev->sdma.num_instances = SDMA_MAX_INSTANCE; | ||
| 821 | |||
| 822 | sdma_v2_4_set_ring_funcs(adev); | 822 | sdma_v2_4_set_ring_funcs(adev); |
| 823 | sdma_v2_4_set_buffer_funcs(adev); | 823 | sdma_v2_4_set_buffer_funcs(adev); |
| 824 | sdma_v2_4_set_vm_pte_funcs(adev); | 824 | sdma_v2_4_set_vm_pte_funcs(adev); |
| @@ -1643,6 +1643,32 @@ static void sdma_v5_2_get_clockgating_state(void *handle, u64 *flags) · 1642 unmodified lines | |||
| 1643 | *flags |= AMD_CG_SUPPORT_SDMA_LS; | 1643 | *flags |= AMD_CG_SUPPORT_SDMA_LS; |
| 1644 | } | 1644 | } |
| 1645 | 1645 | ||
| 1646 | static void sdma_v5_2_ring_begin_use(struct amdgpu_ring *ring) | ||
| 1647 | { | ||
| 1648 | struct amdgpu_device *adev = ring->adev; | ||
| 1649 | |||
| 1650 | /* SDMA 5.2.3 (RMB) FW doesn't seem to properly | ||
| 1651 | * disallow GFXOFF in some cases leading to | ||
| 1652 | * hangs in SDMA. Disallow GFXOFF while SDMA is active. | ||
| 1653 | * We can probably just limit this to 5.2.3, | ||
| 1654 | * but it shouldn't hurt for other parts since | ||
| 1655 | * this GFXOFF will be disallowed anyway when SDMA is | ||
| 1656 | * active, this just makes it explicit. | ||
| 1657 | */ | ||
| 1658 | amdgpu_gfx_off_ctrl(adev, false); | ||
| 1659 | } | ||
| 1660 | |||
| 1661 | static void sdma_v5_2_ring_end_use(struct amdgpu_ring *ring) | ||
| 1662 | { | ||
| 1663 | struct amdgpu_device *adev = ring->adev; | ||
| 1664 | |||
| 1665 | /* SDMA 5.2.3 (RMB) FW doesn't seem to properly | ||
| 1666 | * disallow GFXOFF in some cases leading to | ||
| 1667 | * hangs in SDMA. Allow GFXOFF when SDMA is complete. | ||
| 1668 | */ | ||
| 1669 | amdgpu_gfx_off_ctrl(adev, true); | ||
| 1670 | } | ||
| 1671 | |||
| 1646 | const struct amd_ip_funcs sdma_v5_2_ip_funcs = { | 1672 | const struct amd_ip_funcs sdma_v5_2_ip_funcs = { |
| 1647 | .name = "sdma_v5_2", | 1673 | .name = "sdma_v5_2", |
| 1648 | .early_init = sdma_v5_2_early_init, | 1674 | .early_init = sdma_v5_2_early_init, |
| @@ -1690,6 +1716,8 @@ static const struct amdgpu_ring_funcs sdma_v5_2_ring_funcs = { · 41 unmodified lines | |||
| 1690 | .test_ib = sdma_v5_2_ring_test_ib, | 1716 | .test_ib = sdma_v5_2_ring_test_ib, |
| 1691 | .insert_nop = sdma_v5_2_ring_insert_nop, | 1717 | .insert_nop = sdma_v5_2_ring_insert_nop, |
| 1692 | .pad_ib = sdma_v5_2_ring_pad_ib, | 1718 | .pad_ib = sdma_v5_2_ring_pad_ib, |
| 1719 | .begin_use = sdma_v5_2_ring_begin_use, | ||
| 1720 | .end_use = sdma_v5_2_ring_end_use, | ||
| 1693 | .emit_wreg = sdma_v5_2_ring_emit_wreg, | 1721 | .emit_wreg = sdma_v5_2_ring_emit_wreg, |
| 1694 | .emit_reg_wait = sdma_v5_2_ring_emit_reg_wait, | 1722 | .emit_reg_wait = sdma_v5_2_ring_emit_reg_wait, |
| 1695 | .emit_reg_write_reg_wait = sdma_v5_2_ring_emit_reg_write_reg_wait, | 1723 | .emit_reg_write_reg_wait = sdma_v5_2_ring_emit_reg_write_reg_wait, |
| @@ -5182,6 +5182,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, · 5181 unmodified lines | |||
| 5182 | if (plane->type == DRM_PLANE_TYPE_CURSOR) | 5182 | if (plane->type == DRM_PLANE_TYPE_CURSOR) |
| 5183 | return; | 5183 | return; |
| 5184 | 5184 | ||
| 5185 | if (new_plane_state->rotation != DRM_MODE_ROTATE_0) | ||
| 5186 | goto ffu; | ||
| 5187 | |||
| 5185 | num_clips = drm_plane_get_damage_clips_count(new_plane_state); | 5188 | num_clips = drm_plane_get_damage_clips_count(new_plane_state); |
| 5186 | clips = drm_plane_get_damage_clips(new_plane_state); | 5189 | clips = drm_plane_get_damage_clips(new_plane_state); |
| 5187 | 5190 | ||
| @@ -465,6 +465,7 @@ struct dc_cursor_mi_param { · 464 unmodified lines | |||
| 465 | struct fixed31_32 v_scale_ratio; | 465 | struct fixed31_32 v_scale_ratio; |
| 466 | enum dc_rotation_angle rotation; | 466 | enum dc_rotation_angle rotation; |
| 467 | bool mirror; | 467 | bool mirror; |
| 468 | struct dc_stream_state *stream; | ||
| 468 | }; | 469 | }; |
| 469 | 470 | ||
| 470 | /* IPP related types */ | 471 | /* IPP related types */ |
| @@ -1077,8 +1077,16 @@ void hubp2_cursor_set_position( · 1076 unmodified lines | |||
| 1077 | if (src_y_offset < 0) | 1077 | if (src_y_offset < 0) |
| 1078 | src_y_offset = 0; | 1078 | src_y_offset = 0; |
| 1079 | /* Save necessary cursor info x, y position. w, h is saved in attribute func. */ | 1079 | /* Save necessary cursor info x, y position. w, h is saved in attribute func. */ |
| 1080 | hubp->cur_rect.x = src_x_offset + param->viewport.x; | 1080 | if (param->stream->link->psr_settings.psr_version >= DC_PSR_VERSION_SU_1 && |
| 1081 | hubp->cur_rect.y = src_y_offset + param->viewport.y; | 1081 | param->rotation != ROTATION_ANGLE_0) { |
| 1082 | hubp->cur_rect.x = 0; | ||
| 1083 | hubp->cur_rect.y = 0; | ||
| 1084 | hubp->cur_rect.w = param->stream->timing.h_addressable; | ||
| 1085 | hubp->cur_rect.h = param->stream->timing.v_addressable; | ||
| 1086 | } else { | ||
| 1087 | hubp->cur_rect.x = src_x_offset + param->viewport.x; | ||
| 1088 | hubp->cur_rect.y = src_y_offset + param->viewport.y; | ||
| 1089 | } | ||
| 1082 | } | 1090 | } |
| 1083 | 1091 | ||
| 1084 | void hubp2_clk_cntl(struct hubp *hubp, bool enable) | 1092 | void hubp2_clk_cntl(struct hubp *hubp, bool enable) |
| @@ -124,7 +124,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 123 unmodified lines | |||
| 124 | .phyclk_mhz = 600.0, | 124 | .phyclk_mhz = 600.0, |
| 125 | .phyclk_d18_mhz = 667.0, | 125 | .phyclk_d18_mhz = 667.0, |
| 126 | .dscclk_mhz = 186.0, | 126 | .dscclk_mhz = 186.0, |
| 127 | .dtbclk_mhz = 625.0, | 127 | .dtbclk_mhz = 600.0, |
| 128 | }, | 128 | }, |
| 129 | { | 129 | { |
| 130 | .state = 1, | 130 | .state = 1, |
| @@ -133,7 +133,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines | |||
| 133 | .phyclk_mhz = 810.0, | 133 | .phyclk_mhz = 810.0, |
| 134 | .phyclk_d18_mhz = 667.0, | 134 | .phyclk_d18_mhz = 667.0, |
| 135 | .dscclk_mhz = 209.0, | 135 | .dscclk_mhz = 209.0, |
| 136 | .dtbclk_mhz = 625.0, | 136 | .dtbclk_mhz = 600.0, |
| 137 | }, | 137 | }, |
| 138 | { | 138 | { |
| 139 | .state = 2, | 139 | .state = 2, |
| @@ -142,7 +142,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines | |||
| 142 | .phyclk_mhz = 810.0, | 142 | .phyclk_mhz = 810.0, |
| 143 | .phyclk_d18_mhz = 667.0, | 143 | .phyclk_d18_mhz = 667.0, |
| 144 | .dscclk_mhz = 209.0, | 144 | .dscclk_mhz = 209.0, |
| 145 | .dtbclk_mhz = 625.0, | 145 | .dtbclk_mhz = 600.0, |
| 146 | }, | 146 | }, |
| 147 | { | 147 | { |
| 148 | .state = 3, | 148 | .state = 3, |
| @@ -151,7 +151,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines | |||
| 151 | .phyclk_mhz = 810.0, | 151 | .phyclk_mhz = 810.0, |
| 152 | .phyclk_d18_mhz = 667.0, | 152 | .phyclk_d18_mhz = 667.0, |
| 153 | .dscclk_mhz = 371.0, | 153 | .dscclk_mhz = 371.0, |
| 154 | .dtbclk_mhz = 625.0, | 154 | .dtbclk_mhz = 600.0, |
| 155 | }, | 155 | }, |
| 156 | { | 156 | { |
| 157 | .state = 4, | 157 | .state = 4, |
| @@ -160,7 +160,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines | |||
| 160 | .phyclk_mhz = 810.0, | 160 | .phyclk_mhz = 810.0, |
| 161 | .phyclk_d18_mhz = 667.0, | 161 | .phyclk_d18_mhz = 667.0, |
| 162 | .dscclk_mhz = 417.0, | 162 | .dscclk_mhz = 417.0, |
| 163 | .dtbclk_mhz = 625.0, | 163 | .dtbclk_mhz = 600.0, |
| 164 | }, | 164 | }, |
| 165 | }, | 165 | }, |
| 166 | .num_states = 5, | 166 | .num_states = 5, |
| @@ -348,6 +348,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, · 181 unmodified lines | |||
| 348 | clock_limits[i].socclk_mhz; | 348 | clock_limits[i].socclk_mhz; |
| 349 | dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz = | 349 | dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz = |
| 350 | clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio; | 350 | clk_table->entries[i].memclk_mhz * clk_table->entries[i].wck_ratio; |
| 351 | dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz = | ||
| 352 | clock_limits[i].dtbclk_mhz; | ||
| 351 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels = | 353 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels = |
| 352 | clk_table->num_entries; | 354 | clk_table->num_entries; |
| 353 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_fclk_levels = | 355 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_fclk_levels = |
| @@ -360,6 +362,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, · 6 unmodified lines | |||
| 360 | clk_table->num_entries; | 362 | clk_table->num_entries; |
| 361 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_memclk_levels = | 363 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_memclk_levels = |
| 362 | clk_table->num_entries; | 364 | clk_table->num_entries; |
| 365 | dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels = | ||
| 366 | clk_table->num_entries; | ||
| 363 | } | 367 | } |
| 364 | } | 368 | } |
| 365 | 369 | ||
| @@ -6329,7 +6329,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 6328 unmodified lines | |||
| 6329 | mode_lib->ms.NoOfDPPThisState, | 6329 | mode_lib->ms.NoOfDPPThisState, |
| 6330 | mode_lib->ms.dpte_group_bytes, | 6330 | mode_lib->ms.dpte_group_bytes, |
| 6331 | s->HostVMInefficiencyFactor, | 6331 | s->HostVMInefficiencyFactor, |
| 6332 | mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024, | 6332 | mode_lib->ms.soc.hostvm_min_page_size_kbytes, |
| 6333 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels); | 6333 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels); |
| 6334 | 6334 | ||
| 6335 | s->NextMaxVStartup = s->MaxVStartupAllPlanes[j]; | 6335 | s->NextMaxVStartup = s->MaxVStartupAllPlanes[j]; |
| @@ -6542,7 +6542,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 206 unmodified lines | |||
| 6542 | mode_lib->ms.cache_display_cfg.plane.HostVMEnable, | 6542 | mode_lib->ms.cache_display_cfg.plane.HostVMEnable, |
| 6543 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels, | 6543 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels, |
| 6544 | mode_lib->ms.cache_display_cfg.plane.GPUVMEnable, | 6544 | mode_lib->ms.cache_display_cfg.plane.GPUVMEnable, |
| 6545 | mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024, | 6545 | mode_lib->ms.soc.hostvm_min_page_size_kbytes, |
| 6546 | mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k], | 6546 | mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k], |
| 6547 | mode_lib->ms.MetaRowBytes[j][k], | 6547 | mode_lib->ms.MetaRowBytes[j][k], |
| 6548 | mode_lib->ms.DPTEBytesPerRow[j][k], | 6548 | mode_lib->ms.DPTEBytesPerRow[j][k], |
| @@ -7687,7 +7687,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · 1138 unmodified lines | |||
| 7687 | CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; | 7687 | CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; |
| 7688 | CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; | 7688 | CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; |
| 7689 | CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes; | 7689 | CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes; |
| 7690 | CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024; | 7690 | CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes; |
| 7691 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn; | 7691 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn; |
| 7692 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode; | 7692 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode; |
| 7693 | CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = mode_lib->ms.PTEBufferSizeNotExceededPerState; | 7693 | CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = mode_lib->ms.PTEBufferSizeNotExceededPerState; |
| @@ -7957,7 +7957,7 @@ dml_bool_t dml_core_mode_support(struct display_mode_lib_st *mode_lib) · 263 unmodified lines | |||
| 7957 | UseMinimumDCFCLK_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; | 7957 | UseMinimumDCFCLK_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; |
| 7958 | UseMinimumDCFCLK_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable; | 7958 | UseMinimumDCFCLK_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable; |
| 7959 | UseMinimumDCFCLK_params->NumberOfActiveSurfaces = mode_lib->ms.num_active_planes; | 7959 | UseMinimumDCFCLK_params->NumberOfActiveSurfaces = mode_lib->ms.num_active_planes; |
| 7960 | UseMinimumDCFCLK_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024; | 7960 | UseMinimumDCFCLK_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes; |
| 7961 | UseMinimumDCFCLK_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; | 7961 | UseMinimumDCFCLK_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; |
| 7962 | UseMinimumDCFCLK_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled; | 7962 | UseMinimumDCFCLK_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled; |
| 7963 | UseMinimumDCFCLK_params->ImmediateFlipRequirement = s->ImmediateFlipRequiredFinal; | 7963 | UseMinimumDCFCLK_params->ImmediateFlipRequirement = s->ImmediateFlipRequiredFinal; |
| @@ -8699,7 +8699,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 735 unmodified lines | |||
| 8699 | CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; | 8699 | CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; |
| 8700 | CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; | 8700 | CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels; |
| 8701 | CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes; | 8701 | CalculateVMRowAndSwath_params->GPUVMMinPageSizeKBytes = mode_lib->ms.cache_display_cfg.plane.GPUVMMinPageSizeKBytes; |
| 8702 | CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024; | 8702 | CalculateVMRowAndSwath_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes; |
| 8703 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn; | 8703 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn; |
| 8704 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode; | 8704 | CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode; |
| 8705 | CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = s->dummy_boolean_array[0]; | 8705 | CalculateVMRowAndSwath_params->PTEBufferSizeNotExceeded = s->dummy_boolean_array[0]; |
| @@ -8805,7 +8805,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 99 unmodified lines | |||
| 8805 | mode_lib->ms.cache_display_cfg.hw.DPPPerSurface, | 8805 | mode_lib->ms.cache_display_cfg.hw.DPPPerSurface, |
| 8806 | locals->dpte_group_bytes, | 8806 | locals->dpte_group_bytes, |
| 8807 | s->HostVMInefficiencyFactor, | 8807 | s->HostVMInefficiencyFactor, |
| 8808 | mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024, | 8808 | mode_lib->ms.soc.hostvm_min_page_size_kbytes, |
| 8809 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels); | 8809 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels); |
| 8810 | 8810 | ||
| 8811 | locals->TCalc = 24.0 / locals->DCFCLKDeepSleep; | 8811 | locals->TCalc = 24.0 / locals->DCFCLKDeepSleep; |
| @@ -8995,7 +8995,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 183 unmodified lines | |||
| 8995 | CalculatePrefetchSchedule_params->GPUVMEnable = mode_lib->ms.cache_display_cfg.plane.GPUVMEnable; | 8995 | CalculatePrefetchSchedule_params->GPUVMEnable = mode_lib->ms.cache_display_cfg.plane.GPUVMEnable; |
| 8996 | CalculatePrefetchSchedule_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable; | 8996 | CalculatePrefetchSchedule_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable; |
| 8997 | CalculatePrefetchSchedule_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; | 8997 | CalculatePrefetchSchedule_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels; |
| 8998 | CalculatePrefetchSchedule_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024; | 8998 | CalculatePrefetchSchedule_params->HostVMMinPageSize = mode_lib->ms.soc.hostvm_min_page_size_kbytes; |
| 8999 | CalculatePrefetchSchedule_params->DynamicMetadataEnable = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataEnable[k]; | 8999 | CalculatePrefetchSchedule_params->DynamicMetadataEnable = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataEnable[k]; |
| 9000 | CalculatePrefetchSchedule_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled; | 9000 | CalculatePrefetchSchedule_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled; |
| 9001 | CalculatePrefetchSchedule_params->DynamicMetadataLinesBeforeActiveRequired = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataLinesBeforeActiveRequired[k]; | 9001 | CalculatePrefetchSchedule_params->DynamicMetadataLinesBeforeActiveRequired = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataLinesBeforeActiveRequired[k]; |
| @@ -9240,7 +9240,7 @@ void dml_core_mode_programming(struct display_mode_lib_st *mode_lib, const struc · 238 unmodified lines | |||
| 9240 | mode_lib->ms.cache_display_cfg.plane.HostVMEnable, | 9240 | mode_lib->ms.cache_display_cfg.plane.HostVMEnable, |
| 9241 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels, | 9241 | mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels, |
| 9242 | mode_lib->ms.cache_display_cfg.plane.GPUVMEnable, | 9242 | mode_lib->ms.cache_display_cfg.plane.GPUVMEnable, |
| 9243 | mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024, | 9243 | mode_lib->ms.soc.hostvm_min_page_size_kbytes, |
| 9244 | locals->PDEAndMetaPTEBytesFrame[k], | 9244 | locals->PDEAndMetaPTEBytesFrame[k], |
| 9245 | locals->MetaRowByte[k], | 9245 | locals->MetaRowByte[k], |
| 9246 | locals->PixelPTEBytesPerRow[k], | 9246 | locals->PixelPTEBytesPerRow[k], |
| @@ -423,8 +423,9 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, · 422 unmodified lines | |||
| 423 | } | 423 | } |
| 424 | 424 | ||
| 425 | for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels; i++) { | 425 | for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels; i++) { |
| 426 | p->in_states->state_array[i].dtbclk_mhz = | 426 | if (dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz > 0) |
| 427 | dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz; | 427 | p->in_states->state_array[i].dtbclk_mhz = |
| 428 | dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz; | ||
| 428 | } | 429 | } |
| 429 | 430 | ||
| 430 | for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dispclk_levels; i++) { | 431 | for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dispclk_levels; i++) { |
| @@ -3417,7 +3417,8 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) · 3416 unmodified lines | |||
| 3417 | .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz, | 3417 | .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz, |
| 3418 | .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert, | 3418 | .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert, |
| 3419 | .rotation = pipe_ctx->plane_state->rotation, | 3419 | .rotation = pipe_ctx->plane_state->rotation, |
| 3420 | .mirror = pipe_ctx->plane_state->horizontal_mirror | 3420 | .mirror = pipe_ctx->plane_state->horizontal_mirror, |
| 3421 | .stream = pipe_ctx->stream, | ||
| 3421 | }; | 3422 | }; |
| 3422 | bool pipe_split_on = false; | 3423 | bool pipe_split_on = false; |
| 3423 | bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) || | 3424 | bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) || |
| @@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link) · 286 unmodified lines | |||
| 287 | if (link && link->dpcd_sink_ext_caps.bits.oled == 1) { | 287 | if (link && link->dpcd_sink_ext_caps.bits.oled == 1) { |
| 288 | if (!read_default_bl_aux(link, &default_backlight)) | 288 | if (!read_default_bl_aux(link, &default_backlight)) |
| 289 | default_backlight = 150000; | 289 | default_backlight = 150000; |
| 290 | // if > 5000, it might be wrong readback | 290 | // if < 1 nits or > 5000, it might be wrong readback |
| 291 | if (default_backlight > 5000000) | 291 | if (default_backlight < 1000 || default_backlight > 5000000) |
| 292 | default_backlight = 150000; | 292 | default_backlight = 150000; |
| 293 | 293 | ||
| 294 | return edp_set_backlight_level_nits(link, true, | 294 | return edp_set_backlight_level_nits(link, true, |
| @@ -839,6 +839,8 @@ bool is_psr_su_specific_panel(struct dc_link *link) · 838 unmodified lines | |||
| 839 | ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) || | 839 | ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) || |
| 840 | (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07))) | 840 | (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07))) |
| 841 | isPSRSUSupported = false; | 841 | isPSRSUSupported = false; |
| 842 | else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03) | ||
| 843 | isPSRSUSupported = false; | ||
| 842 | else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1) | 844 | else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1) |
| 843 | isPSRSUSupported = true; | 845 | isPSRSUSupported = true; |
| 844 | } | 846 | } |
| @@ -2198,10 +2198,10 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ · 2197 unmodified lines | |||
| 2198 | } else if (DEVICE_ATTR_IS(xgmi_plpd_policy)) { | 2198 | } else if (DEVICE_ATTR_IS(xgmi_plpd_policy)) { |
| 2199 | if (amdgpu_dpm_get_xgmi_plpd_mode(adev, NULL) == XGMI_PLPD_NONE) | 2199 | if (amdgpu_dpm_get_xgmi_plpd_mode(adev, NULL) == XGMI_PLPD_NONE) |
| 2200 | *states = ATTR_STATE_UNSUPPORTED; | 2200 | *states = ATTR_STATE_UNSUPPORTED; |
| 2201 | } else if (DEVICE_ATTR_IS(pp_dpm_mclk_od)) { | 2201 | } else if (DEVICE_ATTR_IS(pp_mclk_od)) { |
| 2202 | if (amdgpu_dpm_get_mclk_od(adev) == -EOPNOTSUPP) | 2202 | if (amdgpu_dpm_get_mclk_od(adev) == -EOPNOTSUPP) |
| 2203 | *states = ATTR_STATE_UNSUPPORTED; | 2203 | *states = ATTR_STATE_UNSUPPORTED; |
| 2204 | } else if (DEVICE_ATTR_IS(pp_dpm_sclk_od)) { | 2204 | } else if (DEVICE_ATTR_IS(pp_sclk_od)) { |
| 2205 | if (amdgpu_dpm_get_sclk_od(adev) == -EOPNOTSUPP) | 2205 | if (amdgpu_dpm_get_sclk_od(adev) == -EOPNOTSUPP) |
| 2206 | *states = ATTR_STATE_UNSUPPORTED; | 2206 | *states = ATTR_STATE_UNSUPPORTED; |
| 2207 | } else if (DEVICE_ATTR_IS(apu_thermal_cap)) { | 2207 | } else if (DEVICE_ATTR_IS(apu_thermal_cap)) { |