samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: sde: wait for pending vsync event in encoder disable

Browse Source 
In some corner cases there is pending vsync timestamp event to
sf when encoder is getting disabled. This is keeping vblank irq
to be enabled after sde_encoder_virt_reset leading to NULL ptr
access. In these cases, wait for vsync event to be completed which
disables the irq.

Change-Id: If0a6be1fc282906fb1b9c0fd18ede1d31d2549b3
Signed-off-by: Raviteja Tamatam <quic_travitej@quicinc.com>
Signed-off-by: Akash Gajjar <quic_agajjar@quicinc.com>
This commit is contained in:
Raviteja Tamatam
2022-10-04 16:49:23 -07:00
committed by Akash Gajjar
parent 04e6f35c65
commit a57c71fa4e
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
msm/sde/sde_encoder.c
View File

@@ -3618,6 +3618,31 @@ void sde_encoder_virt_reset(struct drm_encoder *drm_enc)
sde_rm_release(&sde_kms->rm, drm_enc, false);
}
static void sde_encoder_wait_for_vsync_event_complete(struct sde_encoder_virt *sde_enc)
{
u32 timeout_ms = DEFAULT_KICKOFF_TIMEOUT_MS;
int i, ret;
if (sde_enc->cur_master)
timeout_ms = sde_enc->cur_master->kickoff_timeout_ms;
ret = wait_event_timeout(sde_enc->vsync_event_wq,
!sde_enc->vblank_enabled,
msecs_to_jiffies(timeout_ms));
SDE_EVT32(timeout_ms, ret);
if (!ret) {
SDE_ERROR("vsync event complete timed out %d\n", ret);
SDE_EVT32(ret, SDE_EVTLOG_ERROR);
for (i = 0; i < sde_enc->num_phys_encs; i++) {
struct sde_encoder_phys *phys = sde_enc->phys_encs[i];
if (phys && phys->ops.control_vblank_irq)
phys->ops.control_vblank_irq(phys, false);
}
}
}
static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
{
struct sde_encoder_virt *sde_enc = NULL;
@@ -3705,6 +3730,13 @@ static void sde_encoder_virt_disable(struct drm_encoder *drm_enc)
SDE_ENC_RC_EVENT_PRE_STOP);
}
/*
* wait for any pending vsync timestamp event to sf
* to ensure vbalnk irq is disabled.
*/
if (sde_enc->vblank_enabled)
sde_encoder_wait_for_vsync_event_complete(sde_enc);
/*
* disable dce after the transfer is complete (for command mode)
* and after physical encoder is disabled, to make sure timing
@@ -4043,6 +4075,9 @@ void sde_encoder_register_vblank_callback(struct drm_encoder *drm_enc,
phys->ops.control_vblank_irq(phys, enable);
}
sde_enc->vblank_enabled = enable;
if (!enable)
wake_up_all(&sde_enc->vsync_event_wq);
}
void sde_encoder_register_frame_event_callback(struct drm_encoder *drm_enc,
@@ -6125,6 +6160,7 @@ struct drm_encoder *sde_encoder_init(struct drm_device *dev, struct msm_display_
sde_enc->frame_trigger_mode = FRAME_DONE_WAIT_POSTED_START;
mutex_init(&sde_enc->rc_lock);
init_waitqueue_head(&sde_enc->vsync_event_wq);
kthread_init_delayed_work(&sde_enc->delayed_off_work,
sde_encoder_off_work);
sde_enc->vblank_enabled = false;

2
msm/sde/sde_encoder.h
View File

@@ -223,6 +223,7 @@ enum sde_sim_qsync_event {
* @ctl_done_supported boolean flag to indicate the availability of
* ctl done irq support for the hardware
* @dynamic_irqs_config bitmask config to enable encoder dynamic irqs
* @vsync_event_wq Queue to wait for the vsync event complete
*/
struct sde_encoder_virt {
struct drm_encoder base;
@@ -295,6 +296,7 @@ struct sde_encoder_virt {
bool ctl_done_supported;
unsigned long dynamic_irqs_config;
wait_queue_head_t vsync_event_wq;
};
#define to_sde_encoder_virt(x) container_of(x, struct sde_encoder_virt, base)