evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm: only set need cdm for INTF3"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-10 21:36:35 -07:00 • committed by Gerrit - the friendly Code Review server
commit ae773d7171
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpu/drm/msm/sde/sde_encoder_phys_vid.c
View file

@ -593,22 +593,33 @@ static void sde_encoder_phys_vid_get_hw_resources(
struct drm_connector_state *conn_state) struct drm_connector_state *conn_state)
{ {
struct sde_encoder_phys_vid *vid_enc; struct sde_encoder_phys_vid *vid_enc;
struct sde_mdss_cfg *vid_catalog;
if (!phys_enc || !hw_res) { if (!phys_enc || !hw_res) {
SDE_ERROR("invalid arg(s), enc %d hw_res %d conn_state %d\n", SDE_ERROR("invalid arg(s), enc %d hw_res %d conn_state %d\n",
phys_enc != 0, hw_res != 0, conn_state != 0); phys_enc != NULL, hw_res != NULL, conn_state != NULL);
return; return;
} }
vid_catalog = phys_enc->sde_kms->catalog;
vid_enc = to_sde_encoder_phys_vid(phys_enc); vid_enc = to_sde_encoder_phys_vid(phys_enc);
if (!vid_enc->hw_intf) { if (!vid_enc->hw_intf || !vid_catalog) {
SDE_ERROR("invalid arg(s), hw_intf\n"); SDE_ERROR("invalid arg(s), hw_intf %d vid_catalog %d\n",
vid_enc->hw_intf != NULL, vid_catalog != NULL);
return; return;
} }
SDE_DEBUG_VIDENC(vid_enc, "\n"); SDE_DEBUG_VIDENC(vid_enc, "\n");
if (vid_enc->hw_intf->idx > INTF_MAX) {
SDE_ERROR("invalid arg(s), idx %d\n",
vid_enc->hw_intf->idx);
return;
}
hw_res->intfs[vid_enc->hw_intf->idx - INTF_0] = INTF_MODE_VIDEO; hw_res->intfs[vid_enc->hw_intf->idx - INTF_0] = INTF_MODE_VIDEO;
hw_res->needs_cdm = true;
if (vid_catalog->intf[vid_enc->hw_intf->idx - INTF_0].type
== INTF_HDMI)
hw_res->needs_cdm = true;
SDE_DEBUG_DRIVER("[vid] needs_cdm=%d\n", hw_res->needs_cdm); SDE_DEBUG_DRIVER("[vid] needs_cdm=%d\n", hw_res->needs_cdm);
} }