OMAPDSS: VENC: allow switching venc output type at runtime

VENC output type (composite/svideo) doesn't have to be fixed by board wiring, it is possible to also provide composite signal through svideo luminance connector (software enabled), which is what pandora does. Having to recompile the kernel for users who have TV connector types that don't match default board setting is very inconvenient, especially for users of a consumer device, so add support for switching VENC output type at runtime over a new sysfs file output_type. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

OMAPDSS: VENC: allow switching venc output type at runtime
VENC output type (composite/svideo) doesn't have to be fixed by board wiring, it is possible to also provide composite signal through svideo luminance connector (software enabled), which is what pandora does. Having to recompile the kernel for users who have TV connector types that don't match default board setting is very inconvenient, especially for users of a consumer device, so add support for switching VENC output type at runtime over a new sysfs file output_type. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Grazvydas Ignotas · Tomi Valkeinen
1 parent 9b71fb5cbc
Showing 2 changed files with 54 additions and 1 deletions Side-by-side Diff
Documentation/arm/OMAP/DSS
drivers/video/omap2/dss/venc.c
@@ -156,6 +156,7 @@
 		"pal" and "ntsc"
 panel_name
 tear_elim	Tearing elimination 0=off, 1=on
+output_type	Output type (video encoder only): "composite" or "svideo"
  
 There are also some debugfs files at <debugfs>/omapdss/ which show information
 about clocks and registers.
@@ -490,16 +490,68 @@
 	return 13500000;
 }
  
+static ssize_t display_output_type_show(struct device *dev,
+		struct device_attribute *attr, char *buf)
+{
+	struct omap_dss_device *dssdev = to_dss_device(dev);
+	const char *ret;
+
+	switch (dssdev->phy.venc.type) {
+	case OMAP_DSS_VENC_TYPE_COMPOSITE:
+		ret = "composite";
+		break;
+	case OMAP_DSS_VENC_TYPE_SVIDEO:
+		ret = "svideo";
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	return snprintf(buf, PAGE_SIZE, "%s\n", ret);
+}
+
+static ssize_t display_output_type_store(struct device *dev,
+		struct device_attribute *attr, const char *buf, size_t size)
+{
+	struct omap_dss_device *dssdev = to_dss_device(dev);
+	enum omap_dss_venc_type new_type;
+
+	if (sysfs_streq("composite", buf))
+		new_type = OMAP_DSS_VENC_TYPE_COMPOSITE;
+	else if (sysfs_streq("svideo", buf))
+		new_type = OMAP_DSS_VENC_TYPE_SVIDEO;
+	else
+		return -EINVAL;
+
+	mutex_lock(&venc.venc_lock);
+
+	if (dssdev->phy.venc.type != new_type) {
+		dssdev->phy.venc.type = new_type;
+		if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
+			venc_power_off(dssdev);
+			venc_power_on(dssdev);
+		}
+	}
+
+	mutex_unlock(&venc.venc_lock);
+
+	return size;
+}
+
+static DEVICE_ATTR(output_type, S_IRUGO | S_IWUSR,
+		display_output_type_show, display_output_type_store);
+
 /* driver */
 static int venc_panel_probe(struct omap_dss_device *dssdev)
 {
 	dssdev->panel.timings = omap_dss_pal_timings;
  
-	return 0;
+	return device_create_file(&dssdev->dev, &dev_attr_output_type);
 }
  
 static void venc_panel_remove(struct omap_dss_device *dssdev)
 {
+	device_remove_file(&dssdev->dev, &dev_attr_output_type);
 }
  
 static int venc_panel_enable(struct omap_dss_device *dssdev)
...	...	@@ -156,6 +156,7 @@
156	156	"pal" and "ntsc"
157	157	panel_name
158	158	tear_elim Tearing elimination 0=off, 1=on
	159	+output_type Output type (video encoder only): "composite" or "svideo"
159	160
160	161	There are also some debugfs files at <debugfs>/omapdss/ which show information
161	162	about clocks and registers.
...	...	@@ -490,16 +490,68 @@
490	490	return 13500000;
491	491	}
492	492
	493	+static ssize_t display_output_type_show(struct device *dev,
	494	+ struct device_attribute attr, char buf)
	495	+{
	496	+ struct omap_dss_device *dssdev = to_dss_device(dev);
	497	+ const char *ret;
	498	+
	499	+ switch (dssdev->phy.venc.type) {
	500	+ case OMAP_DSS_VENC_TYPE_COMPOSITE:
	501	+ ret = "composite";
	502	+ break;
	503	+ case OMAP_DSS_VENC_TYPE_SVIDEO:
	504	+ ret = "svideo";
	505	+ break;
	506	+ default:
	507	+ return -EINVAL;
	508	+ }
	509	+
	510	+ return snprintf(buf, PAGE_SIZE, "%s\n", ret);
	511	+}
	512	+
	513	+static ssize_t display_output_type_store(struct device *dev,
	514	+ struct device_attribute attr, const char buf, size_t size)
	515	+{
	516	+ struct omap_dss_device *dssdev = to_dss_device(dev);
	517	+ enum omap_dss_venc_type new_type;
	518	+
	519	+ if (sysfs_streq("composite", buf))
	520	+ new_type = OMAP_DSS_VENC_TYPE_COMPOSITE;
	521	+ else if (sysfs_streq("svideo", buf))
	522	+ new_type = OMAP_DSS_VENC_TYPE_SVIDEO;
	523	+ else
	524	+ return -EINVAL;
	525	+
	526	+ mutex_lock(&venc.venc_lock);
	527	+
	528	+ if (dssdev->phy.venc.type != new_type) {
	529	+ dssdev->phy.venc.type = new_type;
	530	+ if (dssdev->state == OMAP_DSS_DISPLAY_ACTIVE) {
	531	+ venc_power_off(dssdev);
	532	+ venc_power_on(dssdev);
	533	+ }
	534	+ }
	535	+
	536	+ mutex_unlock(&venc.venc_lock);
	537	+
	538	+ return size;
	539	+}
	540	+
	541	+static DEVICE_ATTR(output_type, S_IRUGO \| S_IWUSR,
	542	+ display_output_type_show, display_output_type_store);
	543	+
493	544	/* driver */
494	545	static int venc_panel_probe(struct omap_dss_device *dssdev)
495	546	{
496	547	dssdev->panel.timings = omap_dss_pal_timings;
497	548
498		- return 0;
	549	+ return device_create_file(&dssdev->dev, &dev_attr_output_type);
499	550	}
500	551
501	552	static void venc_panel_remove(struct omap_dss_device *dssdev)
502	553	{
	554	+ device_remove_file(&dssdev->dev, &dev_attr_output_type);
503	555	}
504	556
505	557	static int venc_panel_enable(struct omap_dss_device *dssdev)