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

Commit 26a4ad42 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge dfbbb08f on remote branch 

Change-Id: Id9ae7b66b8ce9193c8b9616424c14e8115f0aad1
parents 2dc0e455 dfbbb08f

msm/dp/dp_display.c

+1 −1
Original line number Diff line number Diff line
@@ -3051,7 +3051,7 @@ static int dp_display_setup_colospace(struct dp_display *dp_display, 
	struct dp_display_private *dp;



	if (!dp_display || !panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		return -EINVAL;

	}

msm/dp/dp_drm.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.

 */



#include <drm/drm_atomic_helper.h>
@@ -336,7 +336,7 @@ int dp_connector_set_colorspace(struct drm_connector *connector, 


	sde_conn = to_sde_connector(connector);

	if (!sde_conn->drv_panel) {

		pr_err("invalid dp panel\n");

		DP_ERR("invalid dp panel\n");

		return -EINVAL;

	}

msm/dp/dp_panel.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2021, The Linux Foundation. All rights reserved.

 */



#include "dp_panel.h"
@@ -2571,7 +2571,7 @@ static int dp_panel_set_colorspace(struct dp_panel *dp_panel, 
	struct dp_panel_private *panel;



	if (!dp_panel) {

		pr_err("invalid input\n");

		DP_ERR("invalid input\n");

		rc = -EINVAL;

		goto end;

	}

msm/dsi/dsi_ctrl.c

+11 −11
Original line number Diff line number Diff line
@@ -657,34 +657,34 @@ static int dsi_ctrl_clocks_deinit(struct dsi_ctrl *ctrl) 
	struct dsi_link_hs_clk_info *hs_link = &ctrl->clk_info.hs_link_clks;

	struct dsi_clk_link_set *rcg = &ctrl->clk_info.rcg_clks;



	if (core->mdp_core_clk)

	if (!IS_ERR_OR_NULL(core->mdp_core_clk))

		devm_clk_put(&ctrl->pdev->dev, core->mdp_core_clk);

	if (core->iface_clk)

	if (!IS_ERR_OR_NULL(core->iface_clk))

		devm_clk_put(&ctrl->pdev->dev, core->iface_clk);

	if (core->core_mmss_clk)

	if (!IS_ERR_OR_NULL(core->core_mmss_clk))

		devm_clk_put(&ctrl->pdev->dev, core->core_mmss_clk);

	if (core->bus_clk)

	if (!IS_ERR_OR_NULL(core->bus_clk))

		devm_clk_put(&ctrl->pdev->dev, core->bus_clk);

	if (core->mnoc_clk)

	if (!IS_ERR_OR_NULL(core->mnoc_clk))

		devm_clk_put(&ctrl->pdev->dev, core->mnoc_clk);



	memset(core, 0x0, sizeof(*core));



	if (hs_link->byte_clk)

	if (!IS_ERR_OR_NULL(hs_link->byte_clk))

		devm_clk_put(&ctrl->pdev->dev, hs_link->byte_clk);

	if (hs_link->pixel_clk)

	if (!IS_ERR_OR_NULL(hs_link->pixel_clk))

		devm_clk_put(&ctrl->pdev->dev, hs_link->pixel_clk);

	if (lp_link->esc_clk)

	if (!IS_ERR_OR_NULL(lp_link->esc_clk))

		devm_clk_put(&ctrl->pdev->dev, lp_link->esc_clk);

	if (hs_link->byte_intf_clk)

	if (!IS_ERR_OR_NULL(hs_link->byte_intf_clk))

		devm_clk_put(&ctrl->pdev->dev, hs_link->byte_intf_clk);



	memset(hs_link, 0x0, sizeof(*hs_link));

	memset(lp_link, 0x0, sizeof(*lp_link));



	if (rcg->byte_clk)

	if (!IS_ERR_OR_NULL(rcg->byte_clk))

		devm_clk_put(&ctrl->pdev->dev, rcg->byte_clk);

	if (rcg->pixel_clk)

	if (!IS_ERR_OR_NULL(rcg->pixel_clk))

		devm_clk_put(&ctrl->pdev->dev, rcg->pixel_clk);



	memset(rcg, 0x0, sizeof(*rcg));

msm/sde/sde_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -1833,7 +1833,7 @@ static int _sde_connector_lm_preference(struct sde_connector *sde_conn, 
		return -EINVAL;

	}



	sde_hw_mixer_set_preference(sde_kms->catalog, num_lm, disp_type);

	sde_conn->lm_mask = sde_hw_mixer_set_preference(sde_kms->catalog, num_lm, disp_type);



	return ret;

}