Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f6827e4 authored by Suprith Malligere Shankaregowda's avatar Suprith Malligere Shankaregowda Committed by Gerrit - the friendly Code Review server
Browse files

Revert "adv7481: return error when PLL lock fails" 



This reverts commit 44d8abb6.

If we return error on PLL lock failure, it results in open_stream
failure for TIF. So, if we open the TV app first and then connect
HDMI cable, it will not start streaming. Therefore reverting this
change.

Change-Id: Ic99a6986a3138bc3abb9e65eb598a743f1634c5c
Signed-off-by: default avatarSuprith Malligere Shankaregowda <supgow@codeaurora.org>
parent 502257f3

drivers/media/i2c/adv7481.c

+15 −1
Original line number Diff line number Diff line
@@ -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__,