New FBDev driver for Intel Vermilion Range

Attached is a patch against 2.6.21-rc5 which adds the Intel Vermilion Range support.

One non-technical question here...

drivers/video/Kconfig config FB_I810_I2C · line 817

Quoted 9 lines

drivers/video/Kconfig +9 -0

+config FB_VERMILION
+	tristate "Vermilion support"
+	depends on FB && PCI && X86
+	select FB_MODE_HELPERS
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	help
+	  This driver supports the Vermilion Range chipset

Is 'Vermillion' the project codename, or the name that end users will actually see when hardware ships? Most of the Intel graphics chopsets have been named things like i810, i925, and so on - if the user-visible name is known, that should probably be reflected in the 'tristate' string and help text (FB_VERMILLION in the code is fine by be though).

Quoted 2 lines · Alan Hourihane

Attached is a patch against 2.6.21-rc5 which adds the Intel Vermilion Range support.

One non-technical question here...

drivers/video/Kconfig config FB_I810_I2C · line 817

Quoted 9 lines

drivers/video/Kconfig +9 -0

+config FB_VERMILION
+	tristate "Vermilion support"
+	depends on FB && PCI && X86
+	select FB_MODE_HELPERS
+	select FB_CFB_FILLRECT
+	select FB_CFB_COPYAREA
+	select FB_CFB_IMAGEBLIT
+	help
+	  This driver supports the Vermilion Range chipset

Is 'Vermillion' the project codename, or the name that end users will actually see when hardware ships? Most of the Intel graphics chopsets have been named things like i810, i925, and so on - if the user-visible name is known, that should probably be reflected in the 'tristate' string and help text (FB_VERMILLION in the code is fine by be though).

drivers/video/vermilion/carillo_ranch.c line 4

Quoted 5 lines · Alan Hourihane

drivers/video/vermilion/carillo_ranch.c new file +4 -0

@@ -0,0 +1,405 @@
+/*  
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *

Saying 'All Rights Reserved' is usually considered the opposite of licensing your code as GPL. I suppose you need to remove that.

As for the above, I've noticed that drivers/video/epson1355fb.c also has this wording and is under the GPL.

Quoted 9 lines · Arnd Bergmann

drivers/video/vermilion/carillo_ranch.c line 4

Quoted 5 lines · Alan Hourihane

drivers/video/vermilion/carillo_ranch.c new file +4 -0

@@ -0,0 +1,405 @@
+/*  
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *

Saying 'All Rights Reserved' is usually considered the opposite of licensing your code as GPL. I suppose you need to remove that.

Arnd,

Thanks for your comments, and I'll review and make appropriate changes as you've suggested.

As for the above, I've noticed that drivers/video/epson1355fb.c also has this wording and is under the GPL.

Attached is a patch against 2.6.21-rc5 which adds the Intel Vermilion Range support.

Intel funded Tungsten Graphics to do this work.

If there's any problems or updates needed to be done to get accepted, please let me know.

drivers/video/vermilion/carillo_ranch.c new file +62 -0

+	__u32 gpio_bar;
+	__u32 saved_panel_state;
+	__u32 saved_clock;
+};
+
 
+static void crvml_panel_on(const struct vml_sys *sys)
+{
+	const struct cr_sys *crsys = container_of(sys, struct cr_sys, sys);
+	__u32 addr = crsys->gpio_bar + CRVML_PANEL_PORT;
+	__u32 cur = inl(addr);
+
+	if (!(cur & CRVML_PANEL_ON)) {
+		/* Make sure LVDS controller is down. */
+		if (cur & 0x00000001) {
+			cur &= ~CRVML_LVDS_ON;
+			outl(cur, addr);
+		}
+		/* Power up Panel */
+		schedule_timeout(HZ / 10);
+		cur |= CRVML_PANEL_ON;
+		outl(cur, addr);
+	}
+
+	/* Power up LVDS controller */
+
+	if (!(cur & CRVML_LVDS_ON)) {
+		schedule_timeout(HZ / 10);
+		outl(cur | CRVML_LVDS_ON, addr);
+	}
+}
+
+static void crvml_panel_off(const struct vml_sys *sys)
+{
+	const struct cr_sys *crsys = container_of(sys, struct cr_sys, sys);
+
+	__u32 addr = crsys->gpio_bar + CRVML_PANEL_PORT;
+	__u32 cur = inl(addr);
+
+	/* Power down LVDS controller first to avoid high currents */
+	if (cur & CRVML_LVDS_ON) {
+		cur &= ~CRVML_LVDS_ON;
+		outl(cur, addr);
+	}
+	if (cur & CRVML_PANEL_ON) {
+		schedule_timeout(HZ / 10);
+		outl(cur & ~CRVML_PANEL_ON, addr);
+	}
+}
+
+static void crvml_backlight_on(const struct vml_sys *sys)
+{
+	const struct cr_sys *crsys = container_of(sys, struct cr_sys, sys);
+	__u32 addr = crsys->gpio_bar + CRVML_PANEL_PORT;
+	__u32 cur = inl(addr);
+
+	if (cur & CRVML_BACKLIGHT_OFF) {
+		cur &= ~CRVML_BACKLIGHT_OFF;
+		outl(cur, addr);
+	}
+}
+
+static void crvml_backlight_off(const struct vml_sys *sys)

drivers/video/vermilion/carillo_ranch.c new file +18 -0

+	__u32 cur = crsys->saved_panel_state;
+
+	if (cur & CRVML_BACKLIGHT_OFF) {
+		crvml_backlight_off(sys);
+	} else {
+		crvml_backlight_on(sys);
+	}
+
+	if (cur & CRVML_PANEL_ON) {
+		crvml_panel_on(sys);
+	} else {
+		crvml_panel_off(sys);
+		if (cur & CRVML_LVDS_ON) {
+			;
+			/* Will not power up LVDS controller while panel is off */
+		}
+	}
+	iowrite32(crsys->saved_clock, clock_reg);

drivers/video/vermilion/carillo_ranch.c new file +27 -0

+	crsys->saved_panel_state = inl(crsys->gpio_bar + CRVML_PANEL_PORT);
+	crsys->saved_clock = ioread32(clock_reg);
+
+	return 0;
+}
+
+static int crvml_nearest_index(const struct vml_sys *sys, int clock)
+{
+
+	int i;
+	int cur_index;
+	int cur_diff;
+	int diff;
+
+	cur_index = 0;
+	cur_diff = clock - crvml_clocks[0];
+	cur_diff = (cur_diff < 0) ? -cur_diff : cur_diff;
+	for (i = 1; i < crvml_num_clocks; ++i) {
+		diff = clock - crvml_clocks[i];
+		diff = (diff < 0) ? -diff : diff;
+		if (diff < cur_diff) {
+			cur_index = i;
+			cur_diff = diff;
+		}
+	}
+	return cur_index;
+}

drivers/video/vermilion/carillo_ranch.c new file +32 -0

+	int index;
+	__u32 clock_val;
+
+	index = crvml_nearest_index(sys, clock);
+
+	if (crvml_clocks[index] != clock)
+		return -EINVAL;
+
+	clock_val = ioread32(clock_reg) & ~CRVML_CLOCK_MASK;
+	clock_val = crvml_clock_bits[index] << CRVML_CLOCK_SHIFT;
+	iowrite32(clock_val, clock_reg);
+	ioread32(clock_reg);
+
+	return 0;
+}
+
 
+
+static int __init crvml_init(void)
+{
+	int err = 0;
+	struct vml_sys *sys;
+	struct cr_sys *crsys;
+
+	crsys = (struct cr_sys *)kmalloc(sizeof(*crsys), GFP_KERNEL);
+
+	if (!crsys)
+		return -ENOMEM;
+
+	sys = &crsys->sys;
+	err = crvml_sysinit(crsys);
+	if (err) {
+		kfree(crsys);

drivers/video/vermilion/vermilion.c new file +6 -0

+
+#ifndef FB_BLANK_UNBLANK
+#define FB_BLANK_UNBLANK	VESA_NO_BLANKING
+#endif
+#ifndef FB_BLANK_NORMAL
+#define FB_BLANK_NORMAL		VESA_NO_BLANKING + 1

drivers/video/vermilion/vermilion.c new file +3 -0

+static int __devinit vml_pci_probe(struct pci_dev *dev,
+				   const struct pci_device_id *id)
+{

drivers/video/vermilion/vermilion.c new file +14 -0

+	vinfo->par = par;
+	vinfo->pipe = 0;
+	par->mutex = &global_mutex;
+	INIT_LIST_HEAD(&par->gpu.head);
+	par->gpu_list = &global_gpu_list;
+	par->vdc = dev;
+	atomic_set(&par->refcount, 1);
+
+	switch (id->device) {
+	case VML_DEVICE_VDC:
+		if ((err = vmlfb_get_gpu(par)))
+			goto out_err_1;
+		if ((err = pci_enable_device(dev)))
+			goto out_err_1;

Quoted 3 lines · Alan Hourihane

Attached is a patch against 2.6.21-rc5 which adds the Intel Vermilion Range support.

Quoted 5 lines

Intel funded Tungsten Graphics to do this work.

If there's any problems or updates needed to be done to get accepted, please let me know.

Preferably, add sparse annotations and compile with make C=1. I've included possible sparse annotations (the only ones I can see) below.

Perhaps backling_on/off and panel_on/off can be moved to the backlight subsystem?

+static struct vml_sys *my_sys = NULL;

drivers/video/vermilion/carillo_ranch.c new file +13 -0

+static void crvml_backlight_on(const struct vml_sys *sys)
+{
+	const struct cr_sys *crsys = container_of(sys, struct cr_sys, sys);
+	__u32 addr = crsys->gpio_bar + CRVML_PANEL_PORT;
+	__u32 cur = inl(addr);
+
+	if (cur & CRVML_BACKLIGHT_OFF) {
+		cur &= ~CRVML_BACKLIGHT_OFF;
+		outl(cur, addr);
+	}
+}
+
+static void crvml_backlight_off(const struct vml_sys *sys)

+/**************************************************************************
+ *
+ * Copyright (c) Intel Corp. 2007.
+ * All Rights Reserved.
+ *
+ * Intel funded Tungsten Graphics (http://www.tungstengraphics.com) to
+ * develop this driver.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.

+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ * USE OR OTHER DEALINGS IN THE SOFTWARE.

+#define __u64 uint64_t

I've updated the Vermilion Range (LE80578) patch against linus' tree.

Hopefully this rectifies all of the issues noted previously.

Let me know again if there's more updates needed.

Thanks to all who responded with the feedback, it was appreciated.

Quoted 6 lines · Alan Hourihane

I've updated the Vermilion Range (LE80578) patch against linus' tree.

Hopefully this rectifies all of the issues noted previously.

Let me know again if there's more updates needed.

Quoted 2 lines

Thanks to all who responded with the feedback, it was appreciated.

This (at least the framebuffer part) looks good to me (except for the excessive curly braces, but that can be fixed easily). Okay if I add a

Signed-off-by Alan Hourihane <[email protected]>?