Merge "drm/msm/dp: reallocate EDID buffer when needed" (cf096efb) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/drm_edid.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -194,7 +194,8 @@ static const struct drm_display_mode drm_dmt_modes[] = {
		/* 0x05 - 640x480@72Hz */
		{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664,
		704, 832, 0, 480, 489, 492, 520, 0,
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC) },
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC),
		.vrefresh = 72, },
		/* 0x06 - 640x480@75Hz */
		{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 656,
		720, 840, 0, 480, 481, 484, 500, 0,
		@@ -551,7 +552,8 @@ static const struct drm_display_mode edid_est_modes[] = {
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC) }, /* 640x480@75Hz */
		{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 31500, 640, 664,
		704, 832, 0, 480, 489, 492, 520, 0,
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC) }, /* 640x480@72Hz */
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC),
		.vrefresh = 72, }, /* 640x480@72Hz */
		{ DRM_MODE("640x480", DRM_MODE_TYPE_DRIVER, 30240, 640, 704,
		768, 864, 0, 480, 483, 486, 525, 0,
		DRM_MODE_FLAG_NHSYNC \| DRM_MODE_FLAG_NVSYNC) }, /* 640x480@67Hz */

+18 −2

Original line number	Diff line number	Diff line
		@@ -117,10 +117,26 @@ static ssize_t dp_debug_write_edid(struct file *file,
		goto bail;

		if (edid_size != debug->edid_size) {
		pr_debug("clearing debug edid\n");
		pr_debug("realloc debug edid\n");

		if (debug->edid) {
		devm_kfree(debug->dev, debug->edid);

		debug->edid = devm_kzalloc(debug->dev,
		edid_size, GFP_KERNEL);
		if (!debug->edid) {
		rc = -ENOMEM;
		goto bail;
		}

		debug->edid_size = edid_size;

		debug->aux->set_sim_mode(debug->aux,
		debug->dp_debug.sim_mode,
		debug->edid, debug->dpcd);
		}
		}

		while (edid_size--) {
		char t[3];
		int d;