From patchwork Thu Feb  7 12:09:11 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rahul Sharma <rahul.sharma@samsung.com>
X-Patchwork-Id: 2110161
Return-Path: <linux-media-owner@vger.kernel.org>
X-Original-To: patchwork-linux-media@patchwork.kernel.org
Delivered-To: patchwork-process-083081@patchwork1.kernel.org
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by patchwork1.kernel.org (Postfix) with ESMTP id 3358A3FCD5
	for <patchwork-linux-media@patchwork.kernel.org>;
	Thu,  7 Feb 2013 11:49:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753804Ab3BGLtY (ORCPT
	<rfc822;patchwork-linux-media@patchwork.kernel.org>);
	Thu, 7 Feb 2013 06:49:24 -0500
Received: from mailout1.samsung.com ([203.254.224.24]:21179 "EHLO
	mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752159Ab3BGLtX (ORCPT
	<rfc822; linux-media@vger.kernel.org>); Thu, 7 Feb 2013 06:49:23 -0500
Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26])
	by mailout1.samsung.com
	(Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit
	(built Nov
	17 2011)) with ESMTP id <0MHU00LS3M66NWJ0@mailout1.samsung.com>; Thu,
	07 Feb 2013 20:49:22 +0900 (KST)
Received: from epcpsbgm1.samsung.com ( [172.20.52.126])
	by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C4.FA.03918.2C493115;
	Thu, 07 Feb 2013 20:49:22 +0900 (KST)
X-AuditID: cbfee61a-b7f7d6d000000f4e-e2-511394c2b032
Received: from epmmp1.local.host ( [203.254.227.16])
	by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 04.FA.03918.1C493115;
	Thu, 07 Feb 2013 20:49:21 +0900 (KST)
Received: from chrome-ubuntu.sisodomain.com ([107.108.73.106])
	by mmp1.samsung.com
	(Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit
	(built Nov
	17 2011)) with ESMTPA id <0MHU00F7OM3VS500@mmp1.samsung.com>; Thu,
	07 Feb 2013 20:49:21 +0900 (KST)
From: Rahul Sharma <rahul.sharma@samsung.com>
To: linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org,
	alsa-devel@alsa-project.org, linux-fbdev@vger.kernel.org
Cc: tomi.valkeinen@ti.com, laurent.pinchart@ideasonboard.com,
	broonie@opensource.wolfsonmicro.com, inki.dae@samsung.com,
	kyungmin.park@samsung.com, r.sh.open@gmail.com, joshi@samsung.com
Subject: [RFC PATCH v2 2/5] drm/edid: temporarily exposing generic edid-read
	interface from drm
Date: Thu, 07 Feb 2013 07:09:11 -0500
Message-id: <1360238951-7022-1-git-send-email-rahul.sharma@samsung.com>
X-Mailer: git-send-email 1.8.0
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFnrALMWRmVeSWpSXmKPExsWyRsSkTvfQFOFAg3XHeSxO9H1gtejZsJXV
	gcnj8ya5AMYoLpuU1JzMstQifbsEroxZ0yawF0wUr+g+epalgXGJUBcjJ4eEgInEm+b77BC2
	mMSFe+vZuhi5OIQEljJKbP9ynhWmaOuG78wQiUWMEn/3trFCOL1MEk+frmECqWIT0JWYffAZ
	I4gtIlAjMffrDrBRzAL7GCVmNt8E2yEskCjxc9c6FhCbRUBV4uCcNUANHBy8Au4Sa686QWyT
	k/iw5xE7SK+EwBE2iRk757BC1AtIfJt8iAWkXkJAVmLTAWaIekmJgytusExgFFzAyLCKUTS1
	ILmgOCk911CvODG3uDQvXS85P3cTIzC8Tv97JrWDcWWDxSFGAQ5GJR7eG0uFAoVYE8uKK3MP
	MUpwMCuJ8J6sEQ4U4k1JrKxKLcqPLyrNSS0+xJgMtHwis5Rocj4w9PNK4g2NTcxNjU0tjYzM
	TE1JE1YS52U89SRASCA9sSQ1OzW1ILUIZgsTB6dUA6PFofxluQletQbfHN6ervj6cLPLnKil
	lpLrQo3EN69wSpnNsnn6ljsKPb81Vnklvt9h1SupIbBMU/z0Ki1VA2XNl5ZzhWbX5x9O51ry
	ebGSuSZPc+haTq7YGu/YLcFyizdVzdm8feb2zyG8HRdvObELJnmsev+sbdL5X26dbyW2rJow
	sUWr57kSS3FGoqEWc1FxIgCusgAlcwIAAA==
X-Brightmail-Tracker: 
 H4sIAAAAAAAAA+NgFupnkeLIzCtJLcpLzFFi42I5/e+xgO7BKcKBBsduWFic6PvAatGzYSur
	A5PH501yAYxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4B
	um6ZOUCjlRTKEnNKgUIBicXFSvp2mCaEhrjpWsA0Ruj6hgTB9RgZoIGENYwZs6ZNYC+YKF7R
	ffQsSwPjEqEuRk4OCQETia0bvjND2GISF+6tZ+ti5OIQEljEKPF3bxsrhNPLJPH06RomkCo2
	AV2J2QefMYLYIgI1EnO/7gDrYBbYxygxs/kmO0hCWCBR4ueudSwgNouAqsTBOWuAGjg4eAXc
	JdZedYLYJifxYc8j9gmM3AsYGVYxiqYWJBcUJ6XnGuoVJ+YWl+al6yXn525iBAfvM6kdjCsb
	LA4xCnAwKvHw3lgqFCjEmlhWXJl7iFGCg1lJhPdkjXCgEG9KYmVValF+fFFpTmrxIcZkoOUT
	maVEk/OBkZVXEm9obGJuamxqaWJhYmZJmrCSOC/jqScBQgLpiSWp2ampBalFMFuYODilGhjZ
	85gkxflvPmL9HnA62GXxsUVLYgwFQz/lcojvPeb2+/zado0XSx6+azrxM/CqtGBxkYmQvUlN
	W8Lrm6Ya7IdeG01UMOH2nD2p767Q2c6IQxukTb08DQr/1LfPc5M9HMe/mzP/2xTttS6skaaP
	mq6JcN89Eiy3u8pRvW/miqJi54+tv022RSuxFGckGmoxFxUnAgCSU4uEogIAAA==
DLP-Filter: Pass
X-MTR: 20000000000000000@CPGS
X-CFilter-Loop: Reflected
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org

It exposes generic interface from drm_edid.c to get the edid data and length
by any display entity. Once I get clear idea about edid handling in CDF, I need
to revert these temporary changes.

Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
---
 drivers/gpu/drm/drm_edid.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 5a3770f..567a565 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -31,6 +31,7 @@
 #include <linux/slab.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <video/display.h>
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
 #include "drm_edid_modes.h"
@@ -386,6 +387,93 @@ out:
 	return NULL;
 }
 
+int generic_drm_do_get_edid(struct i2c_adapter *adapter,
+	struct display_entity_edid *edid)
+{
+	int i, j = 0, valid_extensions = 0;
+	u8 *block, *new;
+	bool print_bad_edid = 0;
+
+	block = kmalloc(EDID_LENGTH, GFP_KERNEL);
+	if (!block)
+		return -ENOMEM;
+
+	/* base block fetch */
+	for (i = 0; i < 4; i++) {
+		if (drm_do_probe_ddc_edid(adapter, block, 0, EDID_LENGTH))
+			goto out;
+		if (drm_edid_block_valid(block, 0, print_bad_edid))
+			break;
+		if (i == 0 && drm_edid_is_zero(block, EDID_LENGTH))
+			goto carp;
+	}
+	if (i == 4)
+		goto carp;
+
+	/* if there's no extensions, we're done */
+	if (block[0x7e] == 0) {
+		edid->edid = block;
+		edid->len = EDID_LENGTH;
+		return 0;
+	}
+
+	new = krealloc(block, (block[0x7e] + 1) * EDID_LENGTH, GFP_KERNEL);
+	if (!new)
+		goto out;
+	block = new;
+	edid->len = (block[0x7e] + 1) * EDID_LENGTH;
+
+	for (j = 1; j <= block[0x7e]; j++) {
+		for (i = 0; i < 4; i++) {
+			if (drm_do_probe_ddc_edid(adapter,
+				  block + (valid_extensions + 1) * EDID_LENGTH,
+				  j, EDID_LENGTH))
+				goto out;
+			if (drm_edid_block_valid(block + (valid_extensions + 1)*
+				EDID_LENGTH, j, print_bad_edid)) {
+				valid_extensions++;
+				break;
+			}
+		}
+		if (i == 4)
+			DRM_DEBUG_KMS("Ignoring inv lock %d.\n", j);
+	}
+
+	if (valid_extensions != block[0x7e]) {
+		block[EDID_LENGTH-1] += block[0x7e] - valid_extensions;
+		block[0x7e] = valid_extensions;
+		new = krealloc(block, (valid_extensions + 1)*
+			EDID_LENGTH, GFP_KERNEL);
+		if (!new)
+			goto out;
+		block = new;
+		edid->len = (valid_extensions + 1) * EDID_LENGTH;
+	}
+
+	edid->edid = block;
+	return 0;
+
+carp:
+	if (print_bad_edid)
+		DRM_DEBUG_KMS("[ERROR]: EDID block %d invalid.\n", j);
+
+out:
+	kfree(block);
+	return -ENOMEM;
+}
+
+
+int generic_drm_get_edid(struct i2c_adapter *adapter,
+	struct display_entity_edid *edid)
+{
+	int ret = -EINVAL;
+	if (drm_probe_ddc(adapter))
+		ret = generic_drm_do_get_edid(adapter, edid);
+
+	return ret;
+}
+EXPORT_SYMBOL(generic_drm_get_edid);
+
 /**
  * Probe DDC presence.
  *