linux-stable.git/drivers/gpu/drm/amd, branch v4.19.48

drm/amd/display: Set stream->mode_changed when connectors change

2019-05-31T13:46:32+00:00

[ Upstream commit b9952f93cd2cf5fca82b06a8179c0f5f7b769e83 ]

[Why]
The kms_plane@plane-position-covered-pipe-*-planes subtests can produce
a sequence of atomic commits such that neither active_changed nor
mode_changed but connectors_changed.

When this happens we remove the old stream from the context and add
a new stream but the new stream doesn't have mode_changed=true set.

This incorrect programming sequence causes CRC mismatches to occur in
the test.

The stream->mode_changed value should be set whenever a new stream
is created.

[How]
A new stream is created whenever drm_atomic_crtc_needs_modeset is true.
We previously covered the active_changed and mode_changed conditions
for the CRTC but connectors_changed is also checked within
drm_atomic_crtc_needs_modeset.

So just use drm_atomic_crtc_needs_modeset directly to determine the
mode_changed flag.

Signed-off-by: Nicholas Kazlauskas 
Reviewed-by: Sun peng Li 
Acked-by: Bhawanpreet Lakha 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: Fix Divide by 0 in memory calculations

2019-05-31T13:46:32+00:00

[ Upstream commit 59979bf8be1784ebfc44215031c6c88ca22ae65d ]

Check if we get any values equal to 0, and set to 1 if so.

Signed-off-by: Murton Liu 
Reviewed-by: Aric Cyr 
Acked-by: Bhawanpreet Lakha 
Acked-by: Sivapiriyan Kumarasamy 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: fix releasing planes when exiting odm

2019-05-31T13:46:31+00:00

[ Upstream commit bc2193992b00488f5734613ac95b78ef2d2803ab ]

Releasing planes should not release the 2nd odm pipe right away,
this change leaves us with 2 pipes with null planes and same stream
when planes are released during odm.

Signed-off-by: Dmytro Laktyushkin 
Reviewed-by: Tony Cheng 
Acked-by: Bhawanpreet Lakha 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amdgpu: fix old fence check in amdgpu_fence_emit

2019-05-31T13:46:23+00:00

[ Upstream commit 3d2aca8c8620346abdba96c6300d2c0b90a1d0cc ]

We don't hold a reference to the old fence, so it can go away
any time we are waiting for it to signal.

Signed-off-by: Christian König 
Reviewed-by: Chunming Zhou 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: If one stream full updates, full update all planes

2019-05-16T17:41:22+00:00

[ Upstream commit c238bfe0be9ef7420f7669a69e27c8c8f4d8a568 ]

[Why]
On some compositors, with two monitors attached, VT terminal
switch can cause a graphical issue by the following means:

There are two streams, one for each monitor. Each stream has one
plane

current state:
	M1:S1->P1
	M2:S2->P2

The user calls for a terminal switch and a commit is made to
change both planes to linear swizzle mode. In atomic check,
a new dc_state is constructed with new planes on each stream

new state:
	M1:S1->P3
	M2:S2->P4

In commit tail, each stream is committed, one at a time. The first
stream (S1) updates properly, triggerring a full update and replacing
the state

current state:
	M1:S1->P3
	M2:S2->P4

The update for S2 comes in, but dc detects that there is no difference
between the stream and plane in the new and current states, and so
triggers a fast update. The fast update does not program swizzle,
so the second monitor is corrupted

[How]
Add a flag to dc_plane_state that forces full updates

When a stream undergoes a full update, set this flag on all changed
planes, then clear it on the current stream

Subsequent streams will get full updates as a result

Signed-off-by: David Francis 
Signed-off-by: Nicholas Kazlauskas 
Reviewed-by: Roman Li 
Acked-by: Bhawanpreet Lakha 
Acked-by: Nicholas Kazlauskas 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: extending AUX SW Timeout

2019-05-16T17:41:20+00:00

[ Upstream commit f4bbebf8e7eb4d294b040ab2d2ba71e70e69b930 ]

[Why]
AUX takes longer to reply when using active DP-DVI dongle on some asics
resulting in up to 2000+ us edid read (timeout).

[How]
1. Adjust AUX poll to match spec
2. Extend the SW timeout. This does not affect normal
operation since we exit the loop as soon as AUX acks.

Signed-off-by: Martin Leung 
Reviewed-by: Jun Lei 
Acked-by: Joshua Aberback 
Acked-by: Leo Li 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: fix cursor black issue

2019-05-10T15:54:08+00:00

[ Upstream commit c1cefe115d1cdc460014483319d440b2f0d07c68 ]

[Why]
the member sdr_white_level of struct dc_cursor_attributes was not
initialized, then the random value result that
dcn10_set_cursor_sdr_white_level() set error hw_scale value 0x20D9(normal
value is 0x3c00), this cause the black cursor issue.

[how]
just initilize the obj of struct dc_cursor_attributes to zero to avoid
the random value.

Reviewed-by: Nicholas Kazlauskas 
Signed-off-by: Tianci Yin 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amdgpu/gmc9: fix VM_L2_CNTL3 programming

2019-04-27T07:36:38+00:00

commit 1925e7d3d4677e681cc2e878c2bdbeaee988c8e2 upstream.

Got accidently dropped when 2+1 level support was added.

Fixes: 6a42fd6fbf534096 ("drm/amdgpu: implement 2+1 PD support for Raven v3")
Reviewed-by: Christian König 
Signed-off-by: Alex Deucher 
Cc: stable@vger.kernel.org
Signed-off-by: Greg Kroah-Hartman

drm/amdkfd: use init_mqd function to allocate object for hid_mqd (CI)

2019-04-20T07:16:04+00:00

[ Upstream commit cac734c2dbd2514f14c8c6a17caba1990d83bf1d ]

if use the legacy method to allocate object, when mqd_hiq need to run
uninit code, it will be cause WARNING call trace.

eg: (s3 suspend test)
[   34.918944] Call Trace:
[   34.918948]  [] dump_stack+0x19/0x1b
[   34.918950]  [] __warn+0xd8/0x100
[   34.918951]  [] warn_slowpath_null+0x1d/0x20
[   34.918991]  [] uninit_mqd_hiq_sdma+0x4e/0x50 [amdgpu]
[   34.919028]  [] uninitialize+0x37/0xe0 [amdgpu]
[   34.919064]  [] kernel_queue_uninit+0x16/0x30 [amdgpu]
[   34.919086]  [] pm_uninit+0x12/0x20 [amdgpu]
[   34.919107]  [] stop_nocpsch+0x15/0x20 [amdgpu]
[   34.919129]  [] kgd2kfd_suspend.part.4+0x2e/0x50 [amdgpu]
[   34.919150]  [] kgd2kfd_suspend+0x17/0x20 [amdgpu]
[   34.919171]  [] amdgpu_amdkfd_suspend+0x1a/0x20 [amdgpu]
[   34.919187]  [] amdgpu_device_suspend+0x88/0x3a0 [amdgpu]
[   34.919189]  [] ? enqueue_entity+0x2ef/0xbe0
[   34.919205]  [] amdgpu_pmops_suspend+0x20/0x30 [amdgpu]
[   34.919207]  [] pci_pm_suspend+0x6f/0x150
[   34.919208]  [] ? pci_pm_freeze+0xf0/0xf0
[   34.919210]  [] dpm_run_callback+0x46/0x90
[   34.919212]  [] __device_suspend+0xfb/0x2a0
[   34.919213]  [] async_suspend+0x1f/0xa0
[   34.919214]  [] async_run_entry_fn+0x3f/0x130
[   34.919216]  [] process_one_work+0x17f/0x440
[   34.919217]  [] worker_thread+0x126/0x3c0
[   34.919218]  [] ? manage_workers.isra.25+0x2a0/0x2a0
[   34.919220]  [] kthread+0xd1/0xe0
[   34.919221]  [] ? insert_kthread_work+0x40/0x40
[   34.919222]  [] ret_from_fork_nospec_begin+0x7/0x21
[   34.919224]  [] ? insert_kthread_work+0x40/0x40
[   34.919224] ---[ end trace 38cd9f65c963adad ]---

Signed-off-by: Kevin Wang 
Reviewed-by: Oak Zeng 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin

drm/amd/display: Enable vblank interrupt during CRC capture

2019-04-05T20:33:13+00:00

[ Upstream commit 428da2bdb05d76c48d0bd8fbfa2e4c102685be08 ]

[Why]
In order to read CRC events when CRC capture is enabled the vblank
interrput handler needs to be running for the CRTC. The handler is
enabled while there is an active vblank reference.

When running IGT tests there will often be no active vblank reference
but the test expects to read a CRC value. This is valid usage (and
works on i915 since they have a CRC interrupt handler) so the reference
to the vblank should be grabbed while capture is active.

This issue was found running:

igt@kms_plane_multiple@atomic-pipe-b-tiling-none

The pipe-b is the only one in the initial commit and was not previously
active so no vblank reference is grabbed. The vblank interrupt is
not enabled and the test times out.

[How]
Keep a reference to the vblank as long as CRC capture is enabled.
If userspace never explicitly disables it then the reference is
also dropped when removing the CRTC from the context (stream = NULL).

Signed-off-by: Nicholas Kazlauskas 
Reviewed-by: Harry Wentland 
Reviewed-by: Sun peng Li 
Acked-by: Leo Li 
Signed-off-by: Alex Deucher 
Signed-off-by: Sasha Levin