Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0a664bb authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/shd: wait additional vsync when all planes are detached"

parents 9e5bc1c4 094ae7db

drivers/gpu/drm/msm/shd/sde_encoder_phys_shd.c

+9 −0
Original line number Diff line number Diff line
@@ -103,6 +103,15 @@ static void sde_encoder_phys_shd_vblank_irq(void *arg, int irq_idx) 
	if (flush_register & shd_ctl->flush_mask)

		goto not_flushed;



	/*

	 * When flush_mask is changed to 0, we need additional vsync

	 * to make sure the detach flush is done

	 */

	if (flush_register && !shd_ctl->flush_mask && shd_ctl->old_mask) {

		shd_ctl->old_mask = 0;

		goto not_flushed;

	}



	new_cnt = atomic_add_unless(&phys_enc->pending_kickoff_cnt, -1, 0);



	if (atomic_add_unless(&phys_enc->pending_retire_fence_cnt, -1, 0))

drivers/gpu/drm/msm/shd/shd_hw.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -256,6 +256,8 @@ static void _sde_shd_flush_hw_ctl(struct sde_hw_ctl *ctx) 


	hw_ctl = container_of(ctx, struct sde_shd_hw_ctl, base);



	hw_ctl->old_mask = hw_ctl->flush_mask;



	hw_ctl->flush_mask = ctx->flush.pending_flush_mask;



	hw_ctl->flush_mask &= CTL_SSPP_FLUSH_MASK;

drivers/gpu/drm/msm/shd/shd_hw.h

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -37,6 +37,7 @@ struct sde_shd_hw_ctl { 
	struct shd_stage_range range;

	struct sde_hw_ctl *orig;

	u32 flush_mask;

	u32 old_mask;

	struct sde_shd_ctl_mixer_cfg mixer_cfg[MAX_BLOCKS];

};