Merge "disp: msm: sde: avoid returning zero vsync count in poms usecase"
This commit is contained in:
committed by
Gerrit - the friendly Code Review server
commit
d4e6b9af67
@@ -5851,7 +5851,6 @@ enum sde_intf_mode sde_encoder_get_intf_mode(struct drm_encoder *encoder)
|
||||
u32 sde_encoder_get_frame_count(struct drm_encoder *encoder)
|
||||
{
|
||||
struct sde_encoder_virt *sde_enc = NULL;
|
||||
struct sde_encoder_phys *phys;
|
||||
|
||||
if (!encoder) {
|
||||
SDE_ERROR("invalid encoder\n");
|
||||
@@ -5859,9 +5858,7 @@ u32 sde_encoder_get_frame_count(struct drm_encoder *encoder)
|
||||
}
|
||||
sde_enc = to_sde_encoder_virt(encoder);
|
||||
|
||||
phys = sde_enc->cur_master;
|
||||
|
||||
return phys ? atomic_read(&sde_enc->vsync_cnt) : 0;
|
||||
return atomic_read(&sde_enc->vsync_cnt);
|
||||
}
|
||||
|
||||
bool sde_encoder_get_vblank_timestamp(struct drm_encoder *encoder,
|
||||
|
||||
Reference in New Issue
Block a user