History

Merge tag 'amd-drm-fixes-6.7-2023-12-13' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

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>

Dave Airlie committed 2 years ago

Commit 7beae482 parents 51af556 a4236c416 files · +84 −34Browse files

Unified · Split

16 files
  1. drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +0 −2
  2. drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 −0
  3. drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c +2 −1
  4. drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c +8 −7
  5. drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +2 −2
  6. drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c +28 −0
  7. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 −0
  8. drivers/gpu/drm/amd/display/dc/dc_hw_types.h +1 −0
  9. drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c +10 −2
  10. drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +9 −5
  11. drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c +8 −8
  12. drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c +3 −2
  13. drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +2 −1
  14. drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c +2 −2
  15. drivers/gpu/drm/amd/display/modules/power/power_helpers.c +2 −0
  16. drivers/gpu/drm/amd/pm/amdgpu_pm.c +2 −2
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c+0−2
@@ -4516,8 +4516,6 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) · 4515 unmodified lines
45164516
45174517 amdgpu_ras_suspend(adev);
45184518
4519− amdgpu_ttm_set_buffer_funcs_status(adev, false);
4520−
45214519 amdgpu_device_ip_suspend_phase1(adev);
45224520
45234521 if (!adev->in_s0ix)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c+2−0
@@ -1343,6 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) · 1342 unmodified lines
13431343
13441344 abo = ttm_to_amdgpu_bo(bo);
13451345
1346+ WARN_ON(abo->vm_bo);
1347+
13461348 if (abo->kfd_bo)
13471349 amdgpu_amdkfd_release_notify(abo);
13481350
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c+2−1
@@ -642,13 +642,14 @@ static void amdgpu_vm_pt_free(struct amdgpu_vm_bo_base *entry) · 641 unmodified lines
642642
643643 if (!entry->bo)
644644 return;
645+
646+ entry->bo->vm_bo = NULL;
645647 shadow = amdgpu_bo_shadowed(entry->bo);
646648 if (shadow) {
647649 ttm_bo_set_bulk_move(&shadow->tbo, NULL);
648650 amdgpu_bo_unref(&shadow);
649651 }
650652 ttm_bo_set_bulk_move(&entry->bo->tbo, NULL);
651− entry->bo->vm_bo = NULL;
652653
653654 spin_lock(&entry->vm->status_lock);
654655 list_del(&entry->vm_status);
drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c+8−7
@@ -155,13 +155,6 @@ static int jpeg_v4_0_5_hw_init(void *handle) · 154 unmodified lines
155155 struct amdgpu_ring *ring = adev->jpeg.inst->ring_dec;
156156 int r;
157157
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−
165158 r = amdgpu_ring_test_helper(ring);
166159 if (r)
167160 return r;
@@ -336,6 +329,14 @@ static int jpeg_v4_0_5_start(struct amdgpu_device *adev) · 168 unmodified lines
336329 if (adev->pm.dpm_enabled)
337330 amdgpu_dpm_enable_jpeg(adev, true);
338331
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+
339340 /* disable power gating */
340341 r = jpeg_v4_0_5_disable_static_power_gating(adev);
341342 if (r)
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c+2−2
@@ -813,12 +813,12 @@ static int sdma_v2_4_early_init(void *handle) · 812 unmodified lines
813813 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
814814 int r;
815815
816+ adev->sdma.num_instances = SDMA_MAX_INSTANCE;
817+
816818 r = sdma_v2_4_init_microcode(adev);
817819 if (r)
818820 return r;
819821
820− adev->sdma.num_instances = SDMA_MAX_INSTANCE;
821−
822822 sdma_v2_4_set_ring_funcs(adev);
823823 sdma_v2_4_set_buffer_funcs(adev);
824824 sdma_v2_4_set_vm_pte_funcs(adev);
drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c+28−0
@@ -1643,6 +1643,32 @@ static void sdma_v5_2_get_clockgating_state(void *handle, u64 *flags) · 1642 unmodified lines
16431643 *flags |= AMD_CG_SUPPORT_SDMA_LS;
16441644 }
16451645
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+
16461672 const struct amd_ip_funcs sdma_v5_2_ip_funcs = {
16471673 .name = "sdma_v5_2",
16481674 .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
16901716 .test_ib = sdma_v5_2_ring_test_ib,
16911717 .insert_nop = sdma_v5_2_ring_insert_nop,
16921718 .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,
16931721 .emit_wreg = sdma_v5_2_ring_emit_wreg,
16941722 .emit_reg_wait = sdma_v5_2_ring_emit_reg_wait,
16951723 .emit_reg_write_reg_wait = sdma_v5_2_ring_emit_reg_write_reg_wait,
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c+3−0
@@ -5182,6 +5182,9 @@ static void fill_dc_dirty_rects(struct drm_plane *plane, · 5181 unmodified lines
51825182 if (plane->type == DRM_PLANE_TYPE_CURSOR)
51835183 return;
51845184
5185+ if (new_plane_state->rotation != DRM_MODE_ROTATE_0)
5186+ goto ffu;
5187+
51855188 num_clips = drm_plane_get_damage_clips_count(new_plane_state);
51865189 clips = drm_plane_get_damage_clips(new_plane_state);
51875190
drivers/gpu/drm/amd/display/dc/dc_hw_types.h+1−0
@@ -465,6 +465,7 @@ struct dc_cursor_mi_param { · 464 unmodified lines
465465 struct fixed31_32 v_scale_ratio;
466466 enum dc_rotation_angle rotation;
467467 bool mirror;
468+ struct dc_stream_state *stream;
468469 };
469470
470471 /* IPP related types */
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c+10−2
@@ -1077,8 +1077,16 @@ void hubp2_cursor_set_position( · 1076 unmodified lines
10771077 if (src_y_offset < 0)
10781078 src_y_offset = 0;
10791079 /* 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;
1081− hubp->cur_rect.y = src_y_offset + param->viewport.y;
1080+ if (param->stream->link->psr_settings.psr_version >= DC_PSR_VERSION_SU_1 &&
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+ }
10821090 }
10831091
10841092 void hubp2_clk_cntl(struct hubp *hubp, bool enable)
drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c+9−5
@@ -124,7 +124,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 123 unmodified lines
124124 .phyclk_mhz = 600.0,
125125 .phyclk_d18_mhz = 667.0,
126126 .dscclk_mhz = 186.0,
127− .dtbclk_mhz = 625.0,
127+ .dtbclk_mhz = 600.0,
128128 },
129129 {
130130 .state = 1,
@@ -133,7 +133,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
133133 .phyclk_mhz = 810.0,
134134 .phyclk_d18_mhz = 667.0,
135135 .dscclk_mhz = 209.0,
136− .dtbclk_mhz = 625.0,
136+ .dtbclk_mhz = 600.0,
137137 },
138138 {
139139 .state = 2,
@@ -142,7 +142,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
142142 .phyclk_mhz = 810.0,
143143 .phyclk_d18_mhz = 667.0,
144144 .dscclk_mhz = 209.0,
145− .dtbclk_mhz = 625.0,
145+ .dtbclk_mhz = 600.0,
146146 },
147147 {
148148 .state = 3,
@@ -151,7 +151,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
151151 .phyclk_mhz = 810.0,
152152 .phyclk_d18_mhz = 667.0,
153153 .dscclk_mhz = 371.0,
154− .dtbclk_mhz = 625.0,
154+ .dtbclk_mhz = 600.0,
155155 },
156156 {
157157 .state = 4,
@@ -160,7 +160,7 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_5_soc = { · 2 unmodified lines
160160 .phyclk_mhz = 810.0,
161161 .phyclk_d18_mhz = 667.0,
162162 .dscclk_mhz = 417.0,
163− .dtbclk_mhz = 625.0,
163+ .dtbclk_mhz = 600.0,
164164 },
165165 },
166166 .num_states = 5,
@@ -348,6 +348,8 @@ void dcn35_update_bw_bounding_box_fpu(struct dc *dc, · 181 unmodified lines
348348 clock_limits[i].socclk_mhz;
349349 dc->dml2_options.bbox_overrides.clks_table.clk_entries[i].memclk_mhz =
350350 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;
351353 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dcfclk_levels =
352354 clk_table->num_entries;
353355 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
360362 clk_table->num_entries;
361363 dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_memclk_levels =
362364 clk_table->num_entries;
365+ dc->dml2_options.bbox_overrides.clks_table.num_entries_per_clk.num_dtbclk_levels =
366+ clk_table->num_entries;
363367 }
364368 }
365369
drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c+8−8
@@ -6329,7 +6329,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 6328 unmodified lines
63296329 mode_lib->ms.NoOfDPPThisState,
63306330 mode_lib->ms.dpte_group_bytes,
63316331 s->HostVMInefficiencyFactor,
6332− mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,
6332+ mode_lib->ms.soc.hostvm_min_page_size_kbytes,
63336333 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);
63346334
63356335 s->NextMaxVStartup = s->MaxVStartupAllPlanes[j];
@@ -6542,7 +6542,7 @@ static void dml_prefetch_check(struct display_mode_lib_st *mode_lib) · 206 unmodified lines
65426542 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,
65436543 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,
65446544 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,
65466546 mode_lib->ms.PDEAndMetaPTEBytesPerFrame[j][k],
65476547 mode_lib->ms.MetaRowBytes[j][k],
65486548 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
76877687 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
76887688 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
76897689 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;
76917691 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;
76927692 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;
76937693 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
79577957 UseMinimumDCFCLK_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
79587958 UseMinimumDCFCLK_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;
79597959 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;
79617961 UseMinimumDCFCLK_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
79627962 UseMinimumDCFCLK_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;
79637963 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
86998699 CalculateVMRowAndSwath_params->HostVMMaxNonCachedPageTableLevels = mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels;
87008700 CalculateVMRowAndSwath_params->GPUVMMaxPageTableLevels = mode_lib->ms.cache_display_cfg.plane.GPUVMMaxPageTableLevels;
87018701 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;
87038703 CalculateVMRowAndSwath_params->PTEBufferModeOverrideEn = mode_lib->ms.cache_display_cfg.plane.PTEBufferModeOverrideEn;
87048704 CalculateVMRowAndSwath_params->PTEBufferModeOverrideVal = mode_lib->ms.cache_display_cfg.plane.PTEBufferMode;
87058705 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
88058805 mode_lib->ms.cache_display_cfg.hw.DPPPerSurface,
88068806 locals->dpte_group_bytes,
88078807 s->HostVMInefficiencyFactor,
8808− mode_lib->ms.soc.hostvm_min_page_size_kbytes * 1024,
8808+ mode_lib->ms.soc.hostvm_min_page_size_kbytes,
88098809 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels);
88108810
88118811 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
89958995 CalculatePrefetchSchedule_params->GPUVMEnable = mode_lib->ms.cache_display_cfg.plane.GPUVMEnable;
89968996 CalculatePrefetchSchedule_params->HostVMEnable = mode_lib->ms.cache_display_cfg.plane.HostVMEnable;
89978997 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;
89998999 CalculatePrefetchSchedule_params->DynamicMetadataEnable = mode_lib->ms.cache_display_cfg.plane.DynamicMetadataEnable[k];
90009000 CalculatePrefetchSchedule_params->DynamicMetadataVMEnabled = mode_lib->ms.ip.dynamic_metadata_vm_enabled;
90019001 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
92409240 mode_lib->ms.cache_display_cfg.plane.HostVMEnable,
92419241 mode_lib->ms.cache_display_cfg.plane.HostVMMaxPageTableLevels,
92429242 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,
92449244 locals->PDEAndMetaPTEBytesFrame[k],
92459245 locals->MetaRowByte[k],
92469246 locals->PixelPTEBytesPerRow[k],
drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c+3−2
@@ -423,8 +423,9 @@ void dml2_init_soc_states(struct dml2_context *dml2, const struct dc *in_dc, · 422 unmodified lines
423423 }
424424
425425 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 =
427− dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz;
426+ if (dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz > 0)
427+ p->in_states->state_array[i].dtbclk_mhz =
428+ dml2->config.bbox_overrides.clks_table.clk_entries[i].dtbclk_mhz;
428429 }
429430
430431 for (i = 0; i < dml2->config.bbox_overrides.clks_table.num_entries_per_clk.num_dispclk_levels; i++) {
drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c+2−1
@@ -3417,7 +3417,8 @@ void dcn10_set_cursor_position(struct pipe_ctx *pipe_ctx) · 3416 unmodified lines
34173417 .h_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.horz,
34183418 .v_scale_ratio = pipe_ctx->plane_res.scl_data.ratios.vert,
34193419 .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,
34213422 };
34223423 bool pipe_split_on = false;
34233424 bool odm_combine_on = (pipe_ctx->next_odm_pipe != NULL) ||
drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c+2−2
@@ -287,8 +287,8 @@ bool set_default_brightness_aux(struct dc_link *link) · 286 unmodified lines
287287 if (link && link->dpcd_sink_ext_caps.bits.oled == 1) {
288288 if (!read_default_bl_aux(link, &default_backlight))
289289 default_backlight = 150000;
290− // if > 5000, it might be wrong readback
291− if (default_backlight > 5000000)
290+ // if < 1 nits or > 5000, it might be wrong readback
291+ if (default_backlight < 1000 || default_backlight > 5000000)
292292 default_backlight = 150000;
293293
294294 return edp_set_backlight_level_nits(link, true,
drivers/gpu/drm/amd/display/modules/power/power_helpers.c+2−0
@@ -839,6 +839,8 @@ bool is_psr_su_specific_panel(struct dc_link *link) · 838 unmodified lines
839839 ((dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x08) ||
840840 (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x07)))
841841 isPSRSUSupported = false;
842+ else if (dpcd_caps->sink_dev_id_str[1] == 0x08 && dpcd_caps->sink_dev_id_str[0] == 0x03)
843+ isPSRSUSupported = false;
842844 else if (dpcd_caps->psr_info.force_psrsu_cap == 0x1)
843845 isPSRSUSupported = true;
844846 }
drivers/gpu/drm/amd/pm/amdgpu_pm.c+2−2
@@ -2198,10 +2198,10 @@ static int default_attr_update(struct amdgpu_device *adev, struct amdgpu_device_ · 2197 unmodified lines
21982198 } else if (DEVICE_ATTR_IS(xgmi_plpd_policy)) {
21992199 if (amdgpu_dpm_get_xgmi_plpd_mode(adev, NULL) == XGMI_PLPD_NONE)
22002200 *states = ATTR_STATE_UNSUPPORTED;
2201− } else if (DEVICE_ATTR_IS(pp_dpm_mclk_od)) {
2201+ } else if (DEVICE_ATTR_IS(pp_mclk_od)) {
22022202 if (amdgpu_dpm_get_mclk_od(adev) == -EOPNOTSUPP)
22032203 *states = ATTR_STATE_UNSUPPORTED;
2204− } else if (DEVICE_ATTR_IS(pp_dpm_sclk_od)) {
2204+ } else if (DEVICE_ATTR_IS(pp_sclk_od)) {
22052205 if (amdgpu_dpm_get_sclk_od(adev) == -EOPNOTSUPP)
22062206 *states = ATTR_STATE_UNSUPPORTED;
22072207 } else if (DEVICE_ATTR_IS(apu_thermal_cap)) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t