Merge "disp: msm: sde: fix null check for encoder dsc disable"
This commit is contained in:

committed by
Gerrit - the friendly Code Review server

commit
a6c09b6f84
@@ -691,13 +691,19 @@ static void _dce_dsc_disable(struct sde_encoder_virt *sde_enc)
|
|||||||
struct sde_hw_ctl *hw_ctl = NULL;
|
struct sde_hw_ctl *hw_ctl = NULL;
|
||||||
struct sde_hw_intf_cfg_v1 cfg;
|
struct sde_hw_intf_cfg_v1 cfg;
|
||||||
|
|
||||||
if (!sde_enc || !sde_enc->phys_encs[0] ||
|
if (!sde_enc || !sde_enc->phys_encs[0]) {
|
||||||
!sde_enc->phys_encs[0]->connector) {
|
|
||||||
SDE_ERROR("invalid params %d %d\n",
|
SDE_ERROR("invalid params %d %d\n",
|
||||||
!sde_enc, sde_enc ? !sde_enc->phys_encs[0] : -1);
|
!sde_enc, sde_enc ? !sde_enc->phys_encs[0] : -1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Connector can be null if the first virt modeset after suspend
|
||||||
|
* is called with dynamic clock or dms enabled.
|
||||||
|
*/
|
||||||
|
if (!sde_enc->phys_encs[0]->connector)
|
||||||
|
return;
|
||||||
|
|
||||||
if (sde_enc->cur_master)
|
if (sde_enc->cur_master)
|
||||||
hw_ctl = sde_enc->cur_master->hw_ctl;
|
hw_ctl = sde_enc->cur_master->hw_ctl;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user