Unverified Commit 88bc003d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9071 [sync] PR-9014: drm/vc4: don't check if plane->state->fb == state->fb 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/9014 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/6HIP4OCNHLJVBBFXEQ4ZZPHAHAZOF4IU/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QGM8 
 
Link:https://gitee.com/openeuler/kernel/pulls/9071

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents dfdb6e44 363d8ebd

drivers/gpu/drm/vc4/vc4_plane.c

+1 −4
Original line number Diff line number Diff line
@@ -1248,9 +1248,6 @@ static int vc4_prepare_fb(struct drm_plane *plane, 


	drm_gem_fb_prepare_fb(plane, state);



	if (plane->state->fb == state->fb)

		return 0;



	ret = vc4_bo_inc_usecnt(bo);

	if (ret)

		return ret;
@@ -1263,7 +1260,7 @@ static void vc4_cleanup_fb(struct drm_plane *plane, 
{

	struct vc4_bo *bo;



	if (plane->state->fb == state->fb || !state->fb)

	if (!state->fb)

		return;



	bo = to_vc4_bo(&drm_fb_cma_get_gem_obj(state->fb, 0)->base);