History

Merge tag 'amd-drm-fixes-5.15-2021-10-21' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes

amd-drm-fixes-5.15-2021-10-21: amdgpu: - Fix a potential out of bounds write in debugfs - Fix revision handling for Yellow Carp - Display fixes for Yellow Carp

Dave Airlie committed 5 years ago

Commit defbbcd2 parents 3906fe9 53c2ff87 files · +27 −21Browse files

Unified · Split

7 files
  1. drivers/gpu/drm/amd/amdgpu/nv.c +1 −1
  2. drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +1 −1
  3. drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +8 −8
  4. drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c +3 −4
  5. drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +10 −3
  6. drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c +3 −3
  7. drivers/gpu/drm/amd/display/include/dal_asic_id.h +1 −1
drivers/gpu/drm/amd/amdgpu/nv.c+1−1
@@ -1257,7 +1257,7 @@ static int nv_common_early_init(void *handle) · 1256 unmodified lines
12571257 AMD_PG_SUPPORT_VCN_DPG |
12581258 AMD_PG_SUPPORT_JPEG;
12591259 if (adev->pdev->device == 0x1681)
1260− adev->external_rev_id = adev->rev_id + 0x19;
1260+ adev->external_rev_id = 0x20;
12611261 else
12621262 adev->external_rev_id = adev->rev_id + 0x01;
12631263 break;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c+1−1
@@ -263,7 +263,7 @@ static ssize_t dp_link_settings_write(struct file *f, const char __user *buf, · 262 unmodified lines
263263 if (!wr_buf)
264264 return -ENOSPC;
265265
266− if (parse_write_buffer_into_params(wr_buf, size,
266+ if (parse_write_buffer_into_params(wr_buf, wr_buf_size,
267267 (long *)param, buf,
268268 max_param_num,
269269 &param_nums)) {
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c+8−8
@@ -366,32 +366,32 @@ static struct wm_table lpddr5_wm_table = { · 365 unmodified lines
366366 .wm_inst = WM_A,
367367 .wm_type = WM_TYPE_PSTATE_CHG,
368368 .pstate_latency_us = 11.65333,
369− .sr_exit_time_us = 5.32,
370− .sr_enter_plus_exit_time_us = 6.38,
369+ .sr_exit_time_us = 11.5,
370+ .sr_enter_plus_exit_time_us = 14.5,
371371 .valid = true,
372372 },
373373 {
374374 .wm_inst = WM_B,
375375 .wm_type = WM_TYPE_PSTATE_CHG,
376376 .pstate_latency_us = 11.65333,
377− .sr_exit_time_us = 9.82,
378− .sr_enter_plus_exit_time_us = 11.196,
377+ .sr_exit_time_us = 11.5,
378+ .sr_enter_plus_exit_time_us = 14.5,
379379 .valid = true,
380380 },
381381 {
382382 .wm_inst = WM_C,
383383 .wm_type = WM_TYPE_PSTATE_CHG,
384384 .pstate_latency_us = 11.65333,
385− .sr_exit_time_us = 9.89,
386− .sr_enter_plus_exit_time_us = 11.24,
385+ .sr_exit_time_us = 11.5,
386+ .sr_enter_plus_exit_time_us = 14.5,
387387 .valid = true,
388388 },
389389 {
390390 .wm_inst = WM_D,
391391 .wm_type = WM_TYPE_PSTATE_CHG,
392392 .pstate_latency_us = 11.65333,
393− .sr_exit_time_us = 9.748,
394− .sr_enter_plus_exit_time_us = 11.102,
393+ .sr_exit_time_us = 11.5,
394+ .sr_enter_plus_exit_time_us = 14.5,
395395 .valid = true,
396396 },
397397 }
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c+3−4
@@ -76,10 +76,6 @@ void dcn31_init_hw(struct dc *dc) · 75 unmodified lines
7676 if (dc->clk_mgr && dc->clk_mgr->funcs->init_clocks)
7777 dc->clk_mgr->funcs->init_clocks(dc->clk_mgr);
7878
79− // Initialize the dccg
80− if (res_pool->dccg->funcs->dccg_init)
81− res_pool->dccg->funcs->dccg_init(res_pool->dccg);
82−
8379 if (IS_FPGA_MAXIMUS_DC(dc->ctx->dce_environment)) {
8480
8581 REG_WRITE(REFCLK_CNTL, 0);
@@ -106,6 +102,9 @@ void dcn31_init_hw(struct dc *dc) · 20 unmodified lines
106102 hws->funcs.bios_golden_init(dc);
107103 hws->funcs.disable_vga(dc->hwseq);
108104 }
105+ // Initialize the dccg
106+ if (res_pool->dccg->funcs->dccg_init)
107+ res_pool->dccg->funcs->dccg_init(res_pool->dccg);
109108
110109 if (dc->debug.enable_mem_low_power.bits.dmcu) {
111110 // Force ERAM to shutdown if DMCU is not enabled
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c+10−3
@@ -217,8 +217,8 @@ struct _vcs_dpi_soc_bounding_box_st dcn3_1_soc = { · 216 unmodified lines
217217 .num_states = 5,
218218 .sr_exit_time_us = 9.0,
219219 .sr_enter_plus_exit_time_us = 11.0,
220− .sr_exit_z8_time_us = 402.0,
221− .sr_enter_plus_exit_z8_time_us = 520.0,
220+ .sr_exit_z8_time_us = 442.0,
221+ .sr_enter_plus_exit_z8_time_us = 560.0,
222222 .writeback_latency_us = 12.0,
223223 .dram_channel_width_bytes = 4,
224224 .round_trip_ping_latency_dcfclk_cycles = 106,
@@ -928,7 +928,7 @@ static const struct dc_debug_options debug_defaults_drv = { · 703 unmodified lines
928928 .disable_dcc = DCC_ENABLE,
929929 .vsr_support = true,
930930 .performance_trace = false,
931− .max_downscale_src_width = 3840,/*upto 4K*/
931+ .max_downscale_src_width = 4096,/*upto true 4K*/
932932 .disable_pplib_wm_range = false,
933933 .scl_reset_length10 = true,
934934 .sanity_checks = false,
@@ -1590,6 +1590,13 @@ static int dcn31_populate_dml_pipes_from_context( · 655 unmodified lines
15901590 pipe = &res_ctx->pipe_ctx[i];
15911591 timing = &pipe->stream->timing;
15921592
1593+ /*
1594+ * Immediate flip can be set dynamically after enabling the plane.
1595+ * We need to require support for immediate flip or underflow can be
1596+ * intermittently experienced depending on peak b/w requirements.
1597+ */
1598+ pipes[pipe_cnt].pipe.src.immediate_flip = true;
1599+
15931600 pipes[pipe_cnt].pipe.src.unbounded_req_mode = false;
15941601 pipes[pipe_cnt].pipe.src.gpuvm = true;
15951602 pipes[pipe_cnt].pipe.src.dcc_fraction_of_zs_req_luma = 0;
drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c+3−3
@@ -5398,9 +5398,9 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l · 5397 unmodified lines
53985398
53995399 v->MaximumReadBandwidthWithPrefetch =
54005400 v->MaximumReadBandwidthWithPrefetch
5401− + dml_max4(
5402− v->VActivePixelBandwidth[i][j][k],
5403− v->VActiveCursorBandwidth[i][j][k]
5401+ + dml_max3(
5402+ v->VActivePixelBandwidth[i][j][k]
5403+ + v->VActiveCursorBandwidth[i][j][k]
54045404 + v->NoOfDPP[i][j][k]
54055405 * (v->meta_row_bandwidth[i][j][k]
54065406 + v->dpte_row_bandwidth[i][j][k]),
drivers/gpu/drm/amd/display/include/dal_asic_id.h+1−1
@@ -227,7 +227,7 @@ enum { · 226 unmodified lines
227227 #define FAMILY_YELLOW_CARP 146
228228
229229 #define YELLOW_CARP_A0 0x01
230−#define YELLOW_CARP_B0 0x1A
230+#define YELLOW_CARP_B0 0x20
231231 #define YELLOW_CARP_UNKNOWN 0xFF
232232
233233 #ifndef ASICREV_IS_YELLOW_CARP

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