Merge "drm/msm: convert errors in logs to debug messages" (aef06aa7) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/drm/msm/msm_drv.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -241,7 +241,8 @@ void __iomem msm_ioremap(struct platform_device pdev, const char *name,
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		if (!res) {
		dev_err(&pdev->dev, "failed to get memory resource: %s\n", name);
		dev_dbg(&pdev->dev, "failed to get memory resource: %s\n",
		name);
		return ERR_PTR(-EINVAL);
		}

		@@ -270,7 +271,7 @@ unsigned long msm_iomap_size(struct platform_device pdev, const char name)
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		if (!res) {
		dev_err(&pdev->dev, "failed to get memory resource: %s\n",
		dev_dbg(&pdev->dev, "failed to get memory resource: %s\n",
		name);
		return 0;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -2967,7 +2967,7 @@ static int _sde_kms_get_splash_data(struct sde_splash_data *data)

		node = of_find_node_by_name(parent, node_name);
		if (!node) {
		SDE_ERROR("failed to find node %s\n", node_name);
		SDE_DEBUG("failed to find node %s\n", node_name);
		return -EINVAL;
		}

		@@ -2987,7 +2987,7 @@ static int _sde_kms_get_splash_data(struct sde_splash_data *data)

		data->num_splash_displays = num_displays;

		pr_info("splash mem num_regions:%d\n", num_regions);
		SDE_DEBUG("splash mem num_regions:%d\n", num_regions);
		if (num_displays > num_regions) {
		share_splash_mem = true;
		pr_info(":%d displays share same splash buf\n", num_displays);
		@@ -3020,7 +3020,7 @@ static int _sde_kms_get_splash_data(struct sde_splash_data *data)
		data->splash_display[i].splash = &data->splash_mem[0];
		}

		pr_info("splash mem for disp:%d add:%lx size:%x\n", (i + 1),
		SDE_DEBUG("splash mem for disp:%d add:%lx size:%x\n", (i + 1),
		splash_display->splash->splash_buf_base,
		splash_display->splash->splash_buf_size);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ struct sde_rsc_client sde_rsc_client_create(u32 rsc_index, char client_name,
		pr_err("invalid rsc index\n");
		return ERR_PTR(-EINVAL);
		} else if (!rsc_prv_list[rsc_index]) {
		pr_err("rsc not probed yet or not available\n");
		pr_debug("rsc not probed yet or not available\n");
		return NULL;
		}

		@@ -250,7 +250,7 @@ bool is_sde_rsc_available(int rsc_index)
		pr_err("invalid rsc index:%d\n", rsc_index);
		return false;
		} else if (!rsc_prv_list[rsc_index]) {
		pr_err("rsc idx:%d not probed yet or not available\n",
		pr_debug("rsc idx:%d not probed yet or not available\n",
		rsc_index);
		return false;
		}