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

Commit 3dae3833 authored by Ajay Singh Parmar's avatar Ajay Singh Parmar
Browse files

drm/msm/dsi-staging: set default topology 



In case topology information is not provided in command line,
set the default topology information to no-override to avoid
accidentally selecting invalid topology.

CRs-Fixed: 2284675
Change-Id: Ie111d4b76a69c575fe6ad6f483b29564f96a6190
Signed-off-by: default avatarAjay Singh Parmar <aparmar@codeaurora.org>
parent a949307d

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+14 −11
Original line number Diff line number Diff line
@@ -1972,11 +1972,12 @@ static void dsi_display_parse_cmdline_topology(struct dsi_display *display, 
	char *boot_str = NULL;

	char *str = NULL;

	char *sw_te = NULL;

	unsigned long value;

	unsigned long cmdline_topology = NO_OVERRIDE;

	unsigned long cmdline_timing = NO_OVERRIDE;



	if (display_type >= MAX_DSI_ACTIVE_DISPLAY) {

		pr_err("display_type=%d not supported\n", display_type);

		return;

		goto end;

	}



	if (display_type == DSI_PRIMARY)
@@ -1990,27 +1991,29 @@ static void dsi_display_parse_cmdline_topology(struct dsi_display *display, 


	str = strnstr(boot_str, ":config", strlen(boot_str));

	if (!str)

		return;

		goto end;



	if (kstrtol(str + strlen(":config"), INT_BASE_10,

				(unsigned long *)&value)) {

				(unsigned long *)&cmdline_topology)) {

		pr_err("invalid config index override: %s\n", boot_str);

		return;

		goto end;

	}

	display->cmdline_topology = value;



	str = strnstr(boot_str, ":timing", strlen(boot_str));

	if (!str)

		return;

		goto end;



	if (kstrtol(str + strlen(":timing"), INT_BASE_10,

				(unsigned long *)&value)) {

				(unsigned long *)&cmdline_timing)) {

		pr_err("invalid timing index override: %s. resetting both timing and config\n",

			boot_str);

		display->cmdline_topology = NO_OVERRIDE;

		return;

		cmdline_topology = NO_OVERRIDE;

		goto end;

	}

	display->cmdline_timing = value;

	pr_debug("successfully parsed command line topology and timing\n");

end:

	display->cmdline_topology = cmdline_topology;

	display->cmdline_timing = cmdline_timing;

}



/**