From patchwork Fri Sep 27 18:50:45 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Showliu <show.liu@linaro.org>
X-Patchwork-Id: 20679
Return-Path: <patchwork-forward+bncBDP3HEPOV4DBBPVHS6JAKGQEYDB3AOQ@linaro.org>
X-Original-To: linaro@patches.linaro.org
Delivered-To: linaro@patches.linaro.org
Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com
 [209.85.216.197])
 by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B230D25E77
 for <linaro@patches.linaro.org>; Fri, 27 Sep 2013 18:51:42 +0000 (UTC)
Received: by mail-qc0-f197.google.com with SMTP id r5sf2712766qcx.0
 for <linaro@patches.linaro.org>; Fri, 27 Sep 2013 11:51:42 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject
 :date:message-id:in-reply-to:references:x-original-sender
 :x-original-authentication-results:precedence:mailing-list:list-id
 :list-post:list-help:list-archive:list-unsubscribe;
 bh=WA1WIRHPcZEVf0FXBBQvevcoL+BQwUze/rT3Dt2M2Tc=;
 b=Yk2OzFd78RXOZaQTiHg0b/SAj+4OnXOakYnMrjocr/Mb+FxhNjQb8OUcXZJNczlA1d
 lNEMHcgOywX9ZA4yDwokTFA5QYlpBqSJvA0s++qwC8aE1yHynZs+YVh9qwPQwOO1VATV
 f+4pkXr7ZaEHQx/Jx6CmxFBCvM78s5mLJb50qVgvnc9gcpQmmS1/DMTb9peLg/3i36m+
 HvnnTxuOu0mbTHdD7ydh3x8puETOYWYUgsAJElEU2gSe0F1fPyt3+CJ0rZrlFuZpzmfQ
 Tqt0zLLj/gfhjvwk+HA0JLnyYW+vzLD2mZ8rmRJVxOelUu29JclR9ck+KgyTYBoHX4XM
 R6vQ==
X-Gm-Message-State: ALoCoQmlnbAYmPMQSNcLu614S8nEeE2oenLsNIaSxgjmZ0aOXVGwHU3fR6deABQYOiyl0G2rf02X
X-Received: by 10.236.51.170 with SMTP id b30mr1322680yhc.45.1380307902452; 
 Fri, 27 Sep 2013 11:51:42 -0700 (PDT)
MIME-Version: 1.0
X-BeenThere: patchwork-forward@linaro.org
Received: by 10.49.104.111 with SMTP id gd15ls1380853qeb.68.gmail;
 Fri, 27 Sep 2013 11:51:42 -0700 (PDT)
X-Received: by 10.220.181.136 with SMTP id by8mr7804274vcb.11.1380307902360; 
 Fri, 27 Sep 2013 11:51:42 -0700 (PDT)
Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com
 [209.85.128.171]) by mx.google.com with ESMTPS id
 cz7si2160135veb.147.1969.12.31.16.00.00
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Fri, 27 Sep 2013 11:51:42 -0700 (PDT)
Received-SPF: neutral (google.com: 209.85.128.171 is neither permitted nor
 denied by best guess record for domain of
 patch+caf_=patchwork-forward=linaro.org@linaro.org)
 client-ip=209.85.128.171; 
Received: by mail-ve0-f171.google.com with SMTP id pa12so2360624veb.30
 for <patchwork-forward@linaro.org>;
 Fri, 27 Sep 2013 11:51:12 -0700 (PDT)
X-Received: by 10.58.133.66 with SMTP id pa2mr7652142veb.18.1380307872241;
 Fri, 27 Sep 2013 11:51:12 -0700 (PDT)
X-Forwarded-To: patchwork-forward@linaro.org
X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org
Delivered-To: patches@linaro.org
Received: by 10.220.174.196 with SMTP id u4csp444888vcz;
 Fri, 27 Sep 2013 11:51:11 -0700 (PDT)
X-Received: by 10.66.156.199 with SMTP id wg7mr12990991pab.81.1380307871360; 
 Fri, 27 Sep 2013 11:51:11 -0700 (PDT)
Received: from mail-pd0-f170.google.com (mail-pd0-f170.google.com
 [209.85.192.170]) by mx.google.com with ESMTPS id
 j10si9480365pae.200.1969.12.31.16.00.00
 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Fri, 27 Sep 2013 11:51:11 -0700 (PDT)
Received-SPF: neutral (google.com: 209.85.192.170 is neither permitted nor
 denied by best guess record for domain of
 show.liu@linaro.org) client-ip=209.85.192.170; 
Received: by mail-pd0-f170.google.com with SMTP id x10so2979850pdj.15
 for <patches@linaro.org>; Fri, 27 Sep 2013 11:51:11 -0700 (PDT)
X-Received: by 10.66.226.46 with SMTP id rp14mr13218932pac.133.1380307870865; 
 Fri, 27 Sep 2013 11:51:10 -0700 (PDT)
Received: from localhost.localdomain (220-137-0-145.dynamic.hinet.net.
 [220.137.0.145]) by mx.google.com with ESMTPSA id
 qf7sm14316669pac.14.1969.12.31.16.00.00
 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
 Fri, 27 Sep 2013 11:51:10 -0700 (PDT)
From: Show Liu <show.liu@linaro.org>
To: dri-devel@lists.freedesktop.org
Cc: linux-media@vger.kernel.org, tom.gall@linaro.org,
 t.katayama@jp.fujitsu.com, vikas.sajjan@linaro.org,
 linaro-kernel@lists.linaro.org, tom.cooksey@arm.com,
 Show Liu <show.liu@linaro.org>
Subject: [PATCH/RFC v3 2/3] Add display entity and set VGA output(site MB)
 as default
Date: Sat, 28 Sep 2013 02:50:45 +0800
Message-Id: <1380307846-27479-3-git-send-email-show.liu@linaro.org>
X-Mailer: git-send-email 1.7.9.5
In-Reply-To: <1380307846-27479-1-git-send-email-show.liu@linaro.org>
References: <1380307846-27479-1-git-send-email-show.liu@linaro.org>
X-Removed-Original-Auth: Dkim didn't pass.
X-Original-Sender: show.liu@linaro.org
X-Original-Authentication-Results: mx.google.com;       spf=neutral
 (google.com: 209.85.128.171 is neither permitted nor denied by best
 guess record for domain of
 patch+caf_=patchwork-forward=linaro.org@linaro.org)
 smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org
Precedence: list
Mailing-list: list patchwork-forward@linaro.org;
 contact patchwork-forward+owners@linaro.org
List-ID: <patchwork-forward.linaro.org>
X-Google-Group-Id: 836684582541
List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, 
 <mailto:patchwork-forward@linaro.org>
List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, 
 <mailto:patchwork-forward+help@linaro.org>
List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/>
List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, 
 <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>

---
 drivers/video/vexpress-dvi.c |   94 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 83 insertions(+), 11 deletions(-)

diff --git a/drivers/video/vexpress-dvi.c b/drivers/video/vexpress-dvi.c
index cbcb443..ca0e5bd 100644
--- a/drivers/video/vexpress-dvi.c
+++ b/drivers/video/vexpress-dvi.c
@@ -18,6 +18,12 @@
 #include <linux/of_device.h>
 #include <linux/vexpress.h>
 
+#include <linux/platform_device.h>
+#include <video/display.h>
+
+struct _mux_fpga {
+	 struct display_entity entity;
+};
 
 static struct vexpress_config_func *vexpress_dvimode_func;
 
@@ -146,6 +152,52 @@ static int vexpress_dvi_fb_event_notify(struct notifier_block *self,
 	return NOTIFY_OK;
 }
 
+static int mux_fpga_set_state(struct display_entity *entity,
+							 enum display_entity_state state)
+{
+	struct media_pad *source;
+	source = media_entity_remote_pad(&entity->entity.pads[0]);
+	if (source == NULL)
+		return -EPIPE;
+	
+	switch (state) {
+	case DISPLAY_ENTITY_STATE_OFF:
+	case DISPLAY_ENTITY_STATE_STANDBY:
+			display_entity_set_stream(to_display_entity(source->entity),
+														source->index,
+														DISPLAY_ENTITY_STREAM_STOPPED);
+			break;
+	
+	case DISPLAY_ENTITY_STATE_ON:
+			display_entity_set_stream(to_display_entity(source->entity),
+														source->index,
+														DISPLAY_ENTITY_STREAM_CONTINUOUS);
+			break;
+	}
+	
+	return 0;
+}
+
+static int mux_fpga_get_params(struct display_entity *entity, unsigned int port,
+							  struct display_entity_interface_params *params)
+{
+	memset(params, 0, sizeof(*params));
+	
+	/* default using VGA interface type */
+	params->type = DISPLAY_ENTITY_INTERFACE_VGA;
+	
+	return 0;
+}
+
+static const struct display_entity_control_ops mux_fpga_control_ops = {
+		.set_state = mux_fpga_set_state,
+		.get_params = mux_fpga_get_params,
+};
+
+static const struct display_entity_ops mux_fpga_ops = {
+		.ctrl = &mux_fpga_control_ops,
+};
+
 static struct notifier_block vexpress_dvi_fb_notifier = {
 	.notifier_call = vexpress_dvi_fb_event_notify,
 };
@@ -170,7 +222,9 @@ static int vexpress_dvi_probe(struct platform_device *pdev)
 	enum vexpress_dvi_func func;
 	const struct of_device_id *match =
 			of_match_device(vexpress_dvi_of_match, &pdev->dev);
-	u32 site;
+	struct _mux_fpga	*mux_fpga = NULL;
+	
+	int ret = 0;
 
 	if (match)
 		func = (enum vexpress_dvi_func)match->data;
@@ -182,18 +236,36 @@ static int vexpress_dvi_probe(struct platform_device *pdev)
 		vexpress_muxfpga_func =
 				vexpress_config_func_get_by_dev(&pdev->dev);
 		device_create_file(&pdev->dev, &dev_attr_fb);
-		/* 	hard-coded for test DRM on RTSM 
-			Set default site = 0
-		*/
-		if (vexpress_dvi_fb < 0){
-			/*default site = 0*/
-			site = 0;
-			vexpress_config_write(vexpress_muxfpga_func, 0, site);
-			vexpress_dvi_fb = site;
-		}
+		
+		/* 	
+		 *	default using VEXPRESS_SITE_MB
+		 */
+		pr_info("Set Site MB as Default\n");
+		vexpress_config_write(vexpress_muxfpga_func, 0, VEXPRESS_SITE_MB);
+		vexpress_dvi_fb = VEXPRESS_SITE_MB;
+
+		/* initialize display entity */
+		mux_fpga = devm_kzalloc(&pdev->dev, sizeof(*mux_fpga), GFP_KERNEL);
+			if (mux_fpga == NULL)
+				return -ENOMEM;
+
+		mux_fpga->entity.dev = &pdev->dev;
+		mux_fpga->entity.ops = &mux_fpga_ops;
+		strlcpy(mux_fpga->entity.name, dev_name(&pdev->dev), sizeof(mux_fpga->entity.name));
+
+		ret = display_entity_init(&mux_fpga->entity, 1, 1);
+		if (ret < 0)
+			return ret;
+
+		ret = display_entity_add(&mux_fpga->entity);
+		if (ret < 0)
+			return ret;
+
+		platform_set_drvdata(pdev, mux_fpga);
 		break;
 	case FUNC_DVIMODE:
 		vexpress_dvimode_func =
+		
 				vexpress_config_func_get_by_dev(&pdev->dev);
 		break;
 	}
@@ -205,7 +277,7 @@ static int vexpress_dvi_probe(struct platform_device *pdev)
 
 	vexpress_dvi_fb_select(vexpress_dvi_fb);
 
-	return 0;
+	return ret;
 }
 
 static const struct platform_device_id vexpress_dvi_id_table[] = {