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

Commit b5878339 authored by Andy Yan's avatar Andy Yan Committed by Philipp Zabel
Browse files

drm: imx: imx-hdmi: make checkpatch happy 



CHECK: Alignment should match open parenthesis
+       if ((hdmi->vic == 10) || (hdmi->vic == 11) ||
+               (hdmi->vic == 12) || (hdmi->vic == 13) ||

CHECK: braces {} should be used on all arms of this statement
+       if (hdmi->hdmi_data.video_mode.mdvi)
[...]
+       else {
[...]

Signed-off-by: default avatarAndy Yan <andy.yan@rock-chips.com>
Reviewed-by: default avatarDaniel Kurtz <djkurtz@chromium.org>
Tested-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent f853f3da

drivers/gpu/drm/imx/imx-hdmi.c

+52 −57
Original line number Diff line number Diff line
@@ -477,13 +477,11 @@ static void imx_hdmi_update_csc_coeffs(struct imx_hdmi *hdmi) 
		u16 coeff_b = (*csc_coeff)[1][i];

		u16 coeff_c = (*csc_coeff)[2][i];



		hdmi_writeb(hdmi, coeff_a & 0xff,

			HDMI_CSC_COEF_A1_LSB + i * 2);

		hdmi_writeb(hdmi, coeff_a & 0xff, HDMI_CSC_COEF_A1_LSB + i * 2);

		hdmi_writeb(hdmi, coeff_a >> 8, HDMI_CSC_COEF_A1_MSB + i * 2);

		hdmi_writeb(hdmi, coeff_b & 0xff, HDMI_CSC_COEF_B1_LSB + i * 2);

		hdmi_writeb(hdmi, coeff_b >> 8, HDMI_CSC_COEF_B1_MSB + i * 2);

		hdmi_writeb(hdmi, coeff_c & 0xff,

			HDMI_CSC_COEF_C1_LSB + i * 2);

		hdmi_writeb(hdmi, coeff_c & 0xff, HDMI_CSC_COEF_C1_LSB + i * 2);

		hdmi_writeb(hdmi, coeff_c >> 8, HDMI_CSC_COEF_C1_MSB + i * 2);

	}
@@ -535,21 +533,22 @@ static void hdmi_video_packetize(struct imx_hdmi *hdmi) 
	struct hdmi_data_info *hdmi_data = &hdmi->hdmi_data;

	u8 val, vp_conf;



	if (hdmi_data->enc_out_format == RGB

		|| hdmi_data->enc_out_format == YCBCR444) {

		if (!hdmi_data->enc_color_depth)

	if (hdmi_data->enc_out_format == RGB ||

	    hdmi_data->enc_out_format == YCBCR444) {

		if (!hdmi_data->enc_color_depth) {

			output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS;

		else if (hdmi_data->enc_color_depth == 8) {

		} else if (hdmi_data->enc_color_depth == 8) {

			color_depth = 4;

			output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_BYPASS;

		} else if (hdmi_data->enc_color_depth == 10)

		} else if (hdmi_data->enc_color_depth == 10) {

			color_depth = 5;

		else if (hdmi_data->enc_color_depth == 12)

		} else if (hdmi_data->enc_color_depth == 12) {

			color_depth = 6;

		else if (hdmi_data->enc_color_depth == 16)

		} else if (hdmi_data->enc_color_depth == 16) {

			color_depth = 7;

		else

		} else {

			return;

		}

	} else if (hdmi_data->enc_out_format == YCBCR422_8BITS) {

		if (!hdmi_data->enc_color_depth ||

		    hdmi_data->enc_color_depth == 8)
@@ -561,8 +560,9 @@ static void hdmi_video_packetize(struct imx_hdmi *hdmi) 
		else

			return;

		output_select = HDMI_VP_CONF_OUTPUT_SELECTOR_YCC422;

	} else

	} else {

		return;

	}



	/* set the packetizer registers */

	val = ((color_depth << HDMI_VP_PR_CD_COLOR_DEPTH_OFFSET) &
@@ -857,8 +857,7 @@ static int hdmi_phy_configure(struct imx_hdmi *hdmi, unsigned char prep, 
			break;



	if (i >= ARRAY_SIZE(curr_ctrl)) {

		dev_err(hdmi->dev,

				"Pixel clock %d - unsupported by HDMI\n",

		dev_err(hdmi->dev, "Pixel clock %d - unsupported by HDMI\n",

			hdmi->hdmi_data.video_mode.mpixelclock);

		return -EINVAL;

	}
@@ -1266,9 +1265,9 @@ static int imx_hdmi_setup(struct imx_hdmi *hdmi, struct drm_display_mode *mode) 
	imx_hdmi_enable_video_path(hdmi);



	/* not for DVI mode */

	if (hdmi->hdmi_data.video_mode.mdvi)

	if (hdmi->hdmi_data.video_mode.mdvi) {

		dev_dbg(hdmi->dev, "%s DVI mode\n", __func__);

	else {

	} else {

		dev_dbg(hdmi->dev, "%s CEA mode\n", __func__);



		/* HDMI Initialization Step E - Configure audio */
@@ -1642,30 +1641,26 @@ static int imx_hdmi_bind(struct device *dev, struct device *master, void *data) 
	hdmi->isfr_clk = devm_clk_get(hdmi->dev, "isfr");

	if (IS_ERR(hdmi->isfr_clk)) {

		ret = PTR_ERR(hdmi->isfr_clk);

		dev_err(hdmi->dev,

			"Unable to get HDMI isfr clk: %d\n", ret);

		dev_err(hdmi->dev, "Unable to get HDMI isfr clk: %d\n", ret);

		return ret;

	}



	ret = clk_prepare_enable(hdmi->isfr_clk);

	if (ret) {

		dev_err(hdmi->dev,

			"Cannot enable HDMI isfr clock: %d\n", ret);

		dev_err(hdmi->dev, "Cannot enable HDMI isfr clock: %d\n", ret);

		return ret;

	}



	hdmi->iahb_clk = devm_clk_get(hdmi->dev, "iahb");

	if (IS_ERR(hdmi->iahb_clk)) {

		ret = PTR_ERR(hdmi->iahb_clk);

		dev_err(hdmi->dev,

			"Unable to get HDMI iahb clk: %d\n", ret);

		dev_err(hdmi->dev, "Unable to get HDMI iahb clk: %d\n", ret);

		goto err_isfr;

	}



	ret = clk_prepare_enable(hdmi->iahb_clk);

	if (ret) {

		dev_err(hdmi->dev,

			"Cannot enable HDMI iahb clock: %d\n", ret);

		dev_err(hdmi->dev, "Cannot enable HDMI iahb clock: %d\n", ret);

		goto err_isfr;

	}