Skip to content

Commit d755ce6

Browse files
charliu-AMDENGalexdeucher
charliu-AMDENG
authored and
alexdeucher
committed
drm/amd/display: correct z8_watermark 16bit to 20bit mask
remove double adjustment for DPREFCLK SS. dprefclk adjusted with SS is used for dp audio only. if adjust DP_DTO, need to adjust VID_M/N Reviewed-by: Muhammad Ahmed <[email protected]> Acked-by: Hamza Mahfooz <[email protected]> Signed-off-by: Charlene Liu <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 04f920d commit d755ce6

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

‎drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ static bool hubbub31_program_stutter_watermarks(
355355
watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns;
356356
prog_wm_value = convert_and_clamp(
357357
watermarks->a.cstate_pstate.cstate_enter_plus_exit_ns,
358-
refclk_mhz, 0xffff);
358+
refclk_mhz, 0xfffff);
359359
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A, 0,
360360
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_A, prog_wm_value);
361361
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_EXIT_WATERMARK_A calculated =%d\n"
@@ -371,7 +371,7 @@ static bool hubbub31_program_stutter_watermarks(
371371
watermarks->a.cstate_pstate.cstate_exit_ns;
372372
prog_wm_value = convert_and_clamp(
373373
watermarks->a.cstate_pstate.cstate_exit_ns,
374-
refclk_mhz, 0xffff);
374+
refclk_mhz, 0xfffff);
375375
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A, 0,
376376
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_A, prog_wm_value);
377377
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_A calculated =%d\n"
@@ -387,7 +387,7 @@ static bool hubbub31_program_stutter_watermarks(
387387
watermarks->a.cstate_pstate.cstate_enter_plus_exit_z8_ns;
388388
prog_wm_value = convert_and_clamp(
389389
watermarks->a.cstate_pstate.cstate_enter_plus_exit_z8_ns,
390-
refclk_mhz, 0xffff);
390+
refclk_mhz, 0xfffff);
391391
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A, 0,
392392
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_A, prog_wm_value);
393393
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_A calculated =%d\n"
@@ -403,7 +403,7 @@ static bool hubbub31_program_stutter_watermarks(
403403
watermarks->a.cstate_pstate.cstate_exit_z8_ns;
404404
prog_wm_value = convert_and_clamp(
405405
watermarks->a.cstate_pstate.cstate_exit_z8_ns,
406-
refclk_mhz, 0xffff);
406+
refclk_mhz, 0xfffff);
407407
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A, 0,
408408
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_A, prog_wm_value);
409409
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_A calculated =%d\n"
@@ -420,7 +420,7 @@ static bool hubbub31_program_stutter_watermarks(
420420
watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns;
421421
prog_wm_value = convert_and_clamp(
422422
watermarks->b.cstate_pstate.cstate_enter_plus_exit_ns,
423-
refclk_mhz, 0xffff);
423+
refclk_mhz, 0xfffff);
424424
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B, 0,
425425
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_B, prog_wm_value);
426426
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_EXIT_WATERMARK_B calculated =%d\n"
@@ -436,7 +436,7 @@ static bool hubbub31_program_stutter_watermarks(
436436
watermarks->b.cstate_pstate.cstate_exit_ns;
437437
prog_wm_value = convert_and_clamp(
438438
watermarks->b.cstate_pstate.cstate_exit_ns,
439-
refclk_mhz, 0xffff);
439+
refclk_mhz, 0xfffff);
440440
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B, 0,
441441
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_B, prog_wm_value);
442442
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_B calculated =%d\n"
@@ -452,7 +452,7 @@ static bool hubbub31_program_stutter_watermarks(
452452
watermarks->b.cstate_pstate.cstate_enter_plus_exit_z8_ns;
453453
prog_wm_value = convert_and_clamp(
454454
watermarks->b.cstate_pstate.cstate_enter_plus_exit_z8_ns,
455-
refclk_mhz, 0xffff);
455+
refclk_mhz, 0xfffff);
456456
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B, 0,
457457
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_B, prog_wm_value);
458458
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_B calculated =%d\n"
@@ -468,7 +468,7 @@ static bool hubbub31_program_stutter_watermarks(
468468
watermarks->b.cstate_pstate.cstate_exit_z8_ns;
469469
prog_wm_value = convert_and_clamp(
470470
watermarks->b.cstate_pstate.cstate_exit_z8_ns,
471-
refclk_mhz, 0xffff);
471+
refclk_mhz, 0xfffff);
472472
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B, 0,
473473
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_B, prog_wm_value);
474474
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_B calculated =%d\n"
@@ -485,7 +485,7 @@ static bool hubbub31_program_stutter_watermarks(
485485
watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns;
486486
prog_wm_value = convert_and_clamp(
487487
watermarks->c.cstate_pstate.cstate_enter_plus_exit_ns,
488-
refclk_mhz, 0xffff);
488+
refclk_mhz, 0xfffff);
489489
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C, 0,
490490
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_C, prog_wm_value);
491491
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_EXIT_WATERMARK_C calculated =%d\n"
@@ -501,7 +501,7 @@ static bool hubbub31_program_stutter_watermarks(
501501
watermarks->c.cstate_pstate.cstate_exit_ns;
502502
prog_wm_value = convert_and_clamp(
503503
watermarks->c.cstate_pstate.cstate_exit_ns,
504-
refclk_mhz, 0xffff);
504+
refclk_mhz, 0xfffff);
505505
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C, 0,
506506
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_C, prog_wm_value);
507507
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_C calculated =%d\n"
@@ -517,7 +517,7 @@ static bool hubbub31_program_stutter_watermarks(
517517
watermarks->c.cstate_pstate.cstate_enter_plus_exit_z8_ns;
518518
prog_wm_value = convert_and_clamp(
519519
watermarks->c.cstate_pstate.cstate_enter_plus_exit_z8_ns,
520-
refclk_mhz, 0xffff);
520+
refclk_mhz, 0xfffff);
521521
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C, 0,
522522
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_C, prog_wm_value);
523523
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_C calculated =%d\n"
@@ -533,7 +533,7 @@ static bool hubbub31_program_stutter_watermarks(
533533
watermarks->c.cstate_pstate.cstate_exit_z8_ns;
534534
prog_wm_value = convert_and_clamp(
535535
watermarks->c.cstate_pstate.cstate_exit_z8_ns,
536-
refclk_mhz, 0xffff);
536+
refclk_mhz, 0xfffff);
537537
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C, 0,
538538
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_C, prog_wm_value);
539539
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_C calculated =%d\n"
@@ -550,7 +550,7 @@ static bool hubbub31_program_stutter_watermarks(
550550
watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns;
551551
prog_wm_value = convert_and_clamp(
552552
watermarks->d.cstate_pstate.cstate_enter_plus_exit_ns,
553-
refclk_mhz, 0xffff);
553+
refclk_mhz, 0xfffff);
554554
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D, 0,
555555
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_D, prog_wm_value);
556556
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_EXIT_WATERMARK_D calculated =%d\n"
@@ -566,7 +566,7 @@ static bool hubbub31_program_stutter_watermarks(
566566
watermarks->d.cstate_pstate.cstate_exit_ns;
567567
prog_wm_value = convert_and_clamp(
568568
watermarks->d.cstate_pstate.cstate_exit_ns,
569-
refclk_mhz, 0xffff);
569+
refclk_mhz, 0xfffff);
570570
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D, 0,
571571
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_D, prog_wm_value);
572572
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_D calculated =%d\n"
@@ -582,7 +582,7 @@ static bool hubbub31_program_stutter_watermarks(
582582
watermarks->d.cstate_pstate.cstate_enter_plus_exit_z8_ns;
583583
prog_wm_value = convert_and_clamp(
584584
watermarks->d.cstate_pstate.cstate_enter_plus_exit_z8_ns,
585-
refclk_mhz, 0xffff);
585+
refclk_mhz, 0xfffff);
586586
REG_SET(DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D, 0,
587587
DCHUBBUB_ARB_ALLOW_SR_ENTER_WATERMARK_Z8_D, prog_wm_value);
588588
DC_LOG_BANDWIDTH_CALCS("SR_ENTER_WATERMARK_Z8_D calculated =%d\n"
@@ -598,7 +598,7 @@ static bool hubbub31_program_stutter_watermarks(
598598
watermarks->d.cstate_pstate.cstate_exit_z8_ns;
599599
prog_wm_value = convert_and_clamp(
600600
watermarks->d.cstate_pstate.cstate_exit_z8_ns,
601-
refclk_mhz, 0xffff);
601+
refclk_mhz, 0xfffff);
602602
REG_SET(DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D, 0,
603603
DCHUBBUB_ARB_ALLOW_SR_EXIT_WATERMARK_Z8_D, prog_wm_value);
604604
DC_LOG_BANDWIDTH_CALCS("SR_EXIT_WATERMARK_Z8_D calculated =%d\n"

0 commit comments

Comments
 (0)