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

Commit f0fa0385 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "DRM: SDE: Fix the spelling in DTS parser"

parents 3105f280 59c20536

Documentation/devicetree/bindings/drm/msm/hdmi-display.txt

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ Example: 
				qcom,mode-v-pulse-width = <10>;

				qcom,mode-v-back-porch = <72>;

				qcom,mode-v-active-high;

				qcom,mode-refersh-rate = <30>;

				qcom,mode-refresh-rate = <30>;

				qcom,mode-clock-in-khz = <297000>;

			};

		};

drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c

+2 −3
Original line number Diff line number Diff line
@@ -2799,7 +2799,6 @@ static int _sde_hdmi_parse_dt_modes(struct device_node *np, 
	u32 v_front_porch, v_pulse_width, v_back_porch;

	bool h_active_high, v_active_high;

	u32 flags = 0;



	root_node = of_get_child_by_name(np, "qcom,customize-modes");

	if (!root_node) {

		root_node = of_parse_phandle(np, "qcom,customize-modes", 0);
@@ -2887,10 +2886,10 @@ static int _sde_hdmi_parse_dt_modes(struct device_node *np, 
		v_active_high = of_property_read_bool(node,

						"qcom,mode-v-active-high");



		rc = of_property_read_u32(node, "qcom,mode-refersh-rate",

		rc = of_property_read_u32(node, "qcom,mode-refresh-rate",

						&mode->vrefresh);

		if (rc) {

			SDE_ERROR("failed to read refersh-rate, rc=%d\n", rc);

			SDE_ERROR("failed to read refresh-rate, rc=%d\n", rc);

			goto fail;

		}

drivers/gpu/drm/msm/sde/sde_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -1808,8 +1808,8 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 
	char feature_name[256];

	struct sde_phy_plane *pp;

	uint32_t features = 0xFFFFFFFF, nformats = 64;

	u32 maxlinewidth = -1, maxupscale = -1, maxdwnscale = -1;

	u32 maxhdeciexp = -1, maxvdeciexp = -1;

	u32 maxlinewidth = 0, maxupscale = 0, maxdwnscale = 0;

	u32 maxhdeciexp = 0, maxvdeciexp = 0;



	if (!plane || !psde) {

		SDE_ERROR("invalid plane\n");