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

Merge "Revert "adv7481: return error when PLL lock fails""

Browse source
This commit is contained in:
Linux Build Service Account 2018-05-01 06:26:36 -07:00 • committed by Gerrit - the friendly Code Review server
commit f7b7bdea5a
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/media/i2c/adv7481.c
View file

@ -55,6 +55,8 @@
#define LOCK_MAX_SLEEP 6000
#define LOCK_NUM_TRIES 200
#define MAX_DEFAULT_WIDTH 1280
#define MAX_DEFAULT_HEIGHT 720
#define MAX_DEFAULT_FRAME_RATE 60
#define MAX_DEFAULT_PIX_CLK_HZ 74240000
@ -1705,7 +1707,8 @@ static int adv7481_get_hdmi_timings(struct adv7481_state *state,
} else {
pr_err("%s(%d): PLL not locked return EBUSY\n",
__func__, __LINE__);
return -EBUSY;
ret = -EBUSY;
goto set_default;
}
/* Check Timing Lock */
@ -1825,6 +1828,17 @@ static int adv7481_get_hdmi_timings(struct adv7481_state *state,
(hdmi_params->pix_rep + 1));
}
set_default:
if (ret) {
pr_debug("%s(%d), error %d resort to default fmt\n",
__func__, __LINE__, ret);
vid_params->act_pix = MAX_DEFAULT_WIDTH;
vid_params->act_lines = MAX_DEFAULT_HEIGHT;
vid_params->fr_rate = MAX_DEFAULT_FRAME_RATE;
vid_params->pix_clk = MAX_DEFAULT_PIX_CLK_HZ;
vid_params->intrlcd = 0;
ret = 0;
}
pr_debug("%s(%d), adv7481 TMDS Resolution: %d x %d @ %d fps\n",
__func__, __LINE__,