Commit 2f2a72de authored by Lu Yao's avatar Lu Yao Committed by Alex Deucher
Browse files

drm/amdgpu: fix drm panic null pointer when driver not support atomic 



When driver not support atomic, fb using plane->fb rather than
plane->state->fb.

Fixes: fe151ed7 ("drm/amdgpu: add generic display panic helper code")
Signed-off-by: default avatarLu Yao <yaolu@kylinos.cn>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c7fc0f37

drivers/gpu/drm/amd/amdgpu/amdgpu_display.c

+6 −1
Original line number Diff line number Diff line
@@ -1880,7 +1880,12 @@ int amdgpu_display_get_scanout_buffer(struct drm_plane *plane, 
				      struct drm_scanout_buffer *sb)

{

	struct amdgpu_bo *abo;

	struct drm_framebuffer *fb = plane->state->fb;

	struct drm_framebuffer *fb;



	if (drm_drv_uses_atomic_modeset(plane->dev))

		fb = plane->state->fb;

	else

		fb = plane->fb;



	if (!fb)

		return -EINVAL;