Commit bcfa48ff authored by Julia Zhang's avatar Julia Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: avoid using null object of framebuffer 



Instead of using state->fb->obj[0] directly, get object from framebuffer
by calling drm_gem_fb_get_obj() and return error code when object is
null to avoid using null object of framebuffer.

Reported-by: default avatarFusheng Huang <fusheng.huang@ecarxgroup.com>
Signed-off-by: default avatarJulia Zhang <Julia.Zhang@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 2ec6c7f8

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

+16 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <drm/drm_atomic_helper.h>

#include <drm/drm_edid.h>

#include <drm/drm_simple_kms_helper.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_vblank.h>



#include "amdgpu.h"
@@ -314,7 +315,13 @@ static int amdgpu_vkms_prepare_fb(struct drm_plane *plane, 
		return 0;

	}

	afb = to_amdgpu_framebuffer(new_state->fb);

	obj = new_state->fb->obj[0];



	obj = drm_gem_fb_get_obj(new_state->fb, 0);

	if (!obj) {

		DRM_ERROR("Failed to get obj from framebuffer\n");

		return -EINVAL;

	}



	rbo = gem_to_amdgpu_bo(obj);

	adev = amdgpu_ttm_adev(rbo->tbo.bdev);
@@ -368,12 +375,19 @@ static void amdgpu_vkms_cleanup_fb(struct drm_plane *plane, 
				   struct drm_plane_state *old_state)

{

	struct amdgpu_bo *rbo;

	struct drm_gem_object *obj;

	int r;



	if (!old_state->fb)

		return;



	rbo = gem_to_amdgpu_bo(old_state->fb->obj[0]);

	obj = drm_gem_fb_get_obj(old_state->fb, 0);

	if (!obj) {

		DRM_ERROR("Failed to get obj from framebuffer\n");

		return;

	}



	rbo = gem_to_amdgpu_bo(obj);

	r = amdgpu_bo_reserve(rbo, false);

	if (unlikely(r)) {

		DRM_ERROR("failed to reserve rbo before unpin\n");