* [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34)
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
@ 2010-02-27 21:58 ` Anatolij Gustschin
2010-02-28 7:04 ` Grant Likely
2010-02-28 14:32 ` sun york-R58495
2010-02-27 21:58 ` [PATCH 1/3] video: add support for getting video mode from device tree Anatolij Gustschin
` (2 subsequent siblings)
3 siblings, 2 replies; 15+ messages in thread
From: Anatolij Gustschin @ 2010-02-27 21:58 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-fbdev, wd, dzu, jrigby, Anatolij Gustschin, yorksun
This patch series rework DIU support patch submitted
previously with the patch series for updating MPC5121
support in mainline. It doesn't add new panel timing data
to the framebuffer driver anymore. Instead we now allow
encoding this data in the device tree. First two patches
add this support.
The third patch for DIU support is rebased, but still
depends on patches for adding MPC5121 USB support (because
it touches shared platform code).
It is intended for inclusion in 2.6.34, since without
DIU support patch framebuffer doesn't work on mpc5121.
Anatolij Gustschin (3):
video: add support for getting video mode from device tree
fbdev: fsl-diu-fb.c: allow setting panel video mode from DT
powerpc/mpc5121: shared DIU framebuffer support
arch/powerpc/platforms/512x/mpc5121_ads.c | 7 +
arch/powerpc/platforms/512x/mpc5121_generic.c | 13 ++
arch/powerpc/platforms/512x/mpc512x.h | 3 +
arch/powerpc/platforms/512x/mpc512x_shared.c | 282 +++++++++++++++++++++++++
arch/powerpc/sysdev/fsl_soc.h | 1 +
drivers/video/Kconfig | 6 +
drivers/video/Makefile | 1 +
drivers/video/fsl-diu-fb.c | 88 +++++---
drivers/video/fsl-diu-fb.h | 223 -------------------
drivers/video/ofmode.c | 95 +++++++++
drivers/video/ofmode.h | 6 +
include/linux/fsl-diu-fb.h | 223 +++++++++++++++++++
12 files changed, 693 insertions(+), 255 deletions(-)
delete mode 100644 drivers/video/fsl-diu-fb.h
create mode 100644 drivers/video/ofmode.c
create mode 100644 drivers/video/ofmode.h
create mode 100644 include/linux/fsl-diu-fb.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 1/3] video: add support for getting video mode from device tree
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
@ 2010-02-27 21:58 ` Anatolij Gustschin
2010-02-28 6:30 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
2010-02-27 21:58 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT Anatolij Gustschin
2010-02-27 21:58 ` [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support Anatolij Gustschin
3 siblings, 1 reply; 15+ messages in thread
From: Anatolij Gustschin @ 2010-02-27 21:58 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-fbdev, wd, dzu, jrigby, Anatolij Gustschin, yorksun
Framebuffer drivers may want to get panel timing info
from the device tree. This patch adds appropriate support.
Subsequent patch for FSL DIU frame buffer driver makes use
of this functionality.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
drivers/video/Kconfig | 5 +++
drivers/video/Makefile | 1 +
drivers/video/ofmode.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++
drivers/video/ofmode.h | 6 +++
4 files changed, 107 insertions(+), 0 deletions(-)
create mode 100644 drivers/video/ofmode.c
create mode 100644 drivers/video/ofmode.h
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 5a5c303..dc1beb0 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -203,6 +203,11 @@ config FB_MACMODES
depends on FB
default n
+config FB_OF_MODE
+ tristate
+ depends on FB && OF
+ default n
+
config FB_BACKLIGHT
bool
depends on FB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 4ecb30c..c4a912b 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_FB_SVGALIB) += svgalib.o
obj-$(CONFIG_FB_MACMODES) += macmodes.o
obj-$(CONFIG_FB_DDC) += fb_ddc.o
obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
+obj-$(CONFIG_FB_OF_MODE) += ofmode.o
# Hardware specific drivers go first
obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o
diff --git a/drivers/video/ofmode.c b/drivers/video/ofmode.c
new file mode 100644
index 0000000..78caad1
--- /dev/null
+++ b/drivers/video/ofmode.c
@@ -0,0 +1,95 @@
+/*
+ * Get video mode settings from Flattened Device Tree.
+ *
+ * Copyright (C) 2010 DENX Software Engineering.
+ * Anatolij Gustschin <agust@denx.de>
+ *
+ * This file is subject to the terms and conditions of the GNU General
+ * Public License version 2. See the file COPYING in the main directory
+ * of this archive for more details.
+ */
+
+#include <linux/fb.h>
+#include <linux/of.h>
+
+int __devinit of_get_video_mode(struct device_node *np,
+ struct fb_info *info)
+{
+ struct fb_videomode dt_mode;
+ const u32 *prop;
+ unsigned int len;
+
+ if (!np || !info)
+ return -EINVAL;
+
+ prop = of_get_property(np, "width", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.xres = *prop;
+
+ prop = of_get_property(np, "height", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.yres = *prop;
+
+ prop = of_get_property(np, "depth", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ info->var.bits_per_pixel = *prop;
+
+ prop = of_get_property(np, "linebytes", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ info->fix.line_length = *prop;
+
+ prop = of_get_property(np, "refresh", &len);
+ if (prop && len = sizeof(u32))
+ dt_mode.refresh = *prop; /* optional */
+
+ prop = of_get_property(np, "pixclock", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.pixclock = *prop;
+
+ prop = of_get_property(np, "left_margin", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.left_margin = *prop;
+
+ prop = of_get_property(np, "right_margin", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.right_margin = *prop;
+
+ prop = of_get_property(np, "upper_margin", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.upper_margin = *prop;
+
+ prop = of_get_property(np, "lower_margin", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.lower_margin = *prop;
+
+ prop = of_get_property(np, "hsync_len", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.hsync_len = *prop;
+
+ prop = of_get_property(np, "vsync_len", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.vsync_len = *prop;
+
+ prop = of_get_property(np, "sync", &len);
+ if (!prop || len != sizeof(u32))
+ goto err;
+ dt_mode.sync = *prop;
+
+ fb_videomode_to_var(&info->var, &dt_mode);
+
+ return 0;
+err:
+ pr_err("%s: Can't find expected mode entry\n", np->full_name);
+ return -EINVAL;
+}
diff --git a/drivers/video/ofmode.h b/drivers/video/ofmode.h
new file mode 100644
index 0000000..9a13bec
--- /dev/null
+++ b/drivers/video/ofmode.h
@@ -0,0 +1,6 @@
+#ifndef _OFMODE_H
+#define _OFMODE_H
+
+extern int __devinit of_get_video_mode(struct device_node *np,
+ struct fb_info *info);
+#endif
--
1.6.3.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
2010-02-27 21:58 ` [PATCH 1/3] video: add support for getting video mode from device tree Anatolij Gustschin
@ 2010-02-27 21:58 ` Anatolij Gustschin
2010-02-28 6:52 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode Grant Likely
2010-02-27 21:58 ` [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support Anatolij Gustschin
3 siblings, 1 reply; 15+ messages in thread
From: Anatolij Gustschin @ 2010-02-27 21:58 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-fbdev, wd, dzu, jrigby, Anatolij Gustschin, yorksun
Add support for specifying display panel data in the device
tree. If no panel data is provided in the device tree, default
video mode will be used as usual.
Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
drivers/video/Kconfig | 1 +
drivers/video/fsl-diu-fb.c | 63 +++++++++++++++++++++++++-------------------
2 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index dc1beb0..c805ecd 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1850,6 +1850,7 @@ config FB_FSL_DIU
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
select PPC_LIB_RHEAP
+ select FB_OF_MODE
---help---
Framebuffer driver for the Freescale SoC DIU
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 4637bcb..19ca1da 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -36,6 +36,8 @@
#include <sysdev/fsl_soc.h>
#include "fsl-diu-fb.h"
+#include "ofmode.h"
+
/*
* These parameters give default parameters
* for video output 1024x768,
@@ -1168,7 +1170,7 @@ static int init_fbinfo(struct fb_info *info)
return 0;
}
-static int __devinit install_fb(struct fb_info *info)
+static int __devinit install_fb(struct device_node *np, struct fb_info *info)
{
int rc;
struct mfb_info *mfbi = info->par;
@@ -1177,33 +1179,40 @@ static int __devinit install_fb(struct fb_info *info)
if (init_fbinfo(info))
return -EINVAL;
- if (mfbi->index = 0) /* plane 0 */
- aoi_mode = fb_mode;
- else
+ if (mfbi->index = 0) { /* plane 0 */
+ /* use default mode for plane0 if there is no mode in DTB */
+ if (of_get_video_mode(np, info) < 0)
+ aoi_mode = fb_mode;
+ else
+ aoi_mode = NULL;
+ } else
aoi_mode = init_aoi_mode;
- pr_debug("mode used = %s\n", aoi_mode);
- rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
- ARRAY_SIZE(fsl_diu_mode_db), &fsl_diu_default_mode, default_bpp);
- switch (rc) {
- case 1:
- pr_debug("using mode specified in @mode\n");
- break;
- case 2:
- pr_debug("using mode specified in @mode "
- "with ignored refresh rate\n");
- break;
- case 3:
- pr_debug("using mode default mode\n");
- break;
- case 4:
- pr_debug("using mode from list\n");
- break;
- default:
- pr_debug("rc = %d\n", rc);
- pr_debug("failed to find mode\n");
- return -EINVAL;
- break;
+ if (aoi_mode) {
+ pr_debug("mode used = %s\n", aoi_mode);
+ rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
+ ARRAY_SIZE(fsl_diu_mode_db),
+ &fsl_diu_default_mode, default_bpp);
+ switch (rc) {
+ case 1:
+ pr_debug("using mode specified in @mode\n");
+ break;
+ case 2:
+ pr_debug("using mode specified in @mode "
+ "with ignored refresh rate\n");
+ break;
+ case 3:
+ pr_debug("using mode default mode\n");
+ break;
+ case 4:
+ pr_debug("using mode from list\n");
+ break;
+ default:
+ pr_debug("rc = %d\n", rc);
+ pr_debug("failed to find mode\n");
+ return -EINVAL;
+ break;
+ }
}
pr_debug("xres_virtual %d\n", info->var.xres_virtual);
@@ -1521,7 +1530,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
mfbi->ad = (struct diu_ad *)((u32)pool.ad.vaddr
+ pool.ad.offset) + i;
mfbi->ad->paddr = pool.ad.paddr + i * sizeof(struct diu_ad);
- ret = install_fb(machine_data->fsl_diu_info[i]);
+ ret = install_fb(np, machine_data->fsl_diu_info[i]);
if (ret) {
dev_err(&ofdev->dev,
"Failed to register framebuffer %d\n",
--
1.6.3.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
` (2 preceding siblings ...)
2010-02-27 21:58 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT Anatolij Gustschin
@ 2010-02-27 21:58 ` Anatolij Gustschin
2010-02-28 6:50 ` Grant Likely
3 siblings, 1 reply; 15+ messages in thread
From: Anatolij Gustschin @ 2010-02-27 21:58 UTC (permalink / raw)
To: linuxppc-dev; +Cc: linux-fbdev, wd, dzu, jrigby, Anatolij Gustschin, yorksun
MPC5121 DIU configuration/setup as initialized by the boot
loader currently will get lost while booting Linux. As a
result displaying the boot splash is not possible through
the boot process.
To prevent this we reserve configured DIU frame buffer
address range while booting and preserve AOI descriptor
and gamma table so that DIU continues displaying through
the whole boot process. On first open from user space
DIU frame buffer driver releases the reserved frame
buffer area and continues to operate as usual.
The patch also moves drivers/video/fsl-diu-fb.h file to
include/linux as we use some DIU structures in platform
code.
'diu_ops' callbacks in platform code borrowed from John's
DIU code.
Signed-off-by: John Rigby <jrigby@gmail.com>
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
arch/powerpc/platforms/512x/mpc5121_ads.c | 7 +
arch/powerpc/platforms/512x/mpc5121_generic.c | 13 ++
arch/powerpc/platforms/512x/mpc512x.h | 3 +
arch/powerpc/platforms/512x/mpc512x_shared.c | 282 +++++++++++++++++++++++++
arch/powerpc/sysdev/fsl_soc.h | 1 +
drivers/video/fsl-diu-fb.c | 25 ++-
drivers/video/fsl-diu-fb.h | 223 -------------------
include/linux/fsl-diu-fb.h | 223 +++++++++++++++++++
8 files changed, 549 insertions(+), 228 deletions(-)
delete mode 100644 drivers/video/fsl-diu-fb.h
create mode 100644 include/linux/fsl-diu-fb.h
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index ee6ae12..aa4d5a8 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -42,6 +42,7 @@ static void __init mpc5121_ads_setup_arch(void)
for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")
mpc83xx_add_bridge(np);
#endif
+ mpc512x_setup_diu();
}
static void __init mpc5121_ads_init_IRQ(void)
@@ -60,11 +61,17 @@ static int __init mpc5121_ads_probe(void)
return of_flat_dt_is_compatible(root, "fsl,mpc5121ads");
}
+void __init mpc5121_ads_init_early(void)
+{
+ mpc512x_init_diu();
+}
+
define_machine(mpc5121_ads) {
.name = "MPC5121 ADS",
.probe = mpc5121_ads_probe,
.setup_arch = mpc5121_ads_setup_arch,
.init = mpc512x_init,
+ .init_early = mpc5121_ads_init_early,
.init_IRQ = mpc5121_ads_init_IRQ,
.get_irq = ipic_get_irq,
.calibrate_decr = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
index a6c0e3a..3aaa281 100644
--- a/arch/powerpc/platforms/512x/mpc5121_generic.c
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -28,6 +28,7 @@
*/
static char *board[] __initdata = {
"prt,prtlvt",
+ "ifm,pdm360ng",
NULL
};
@@ -48,10 +49,22 @@ static int __init mpc5121_generic_probe(void)
return board[i] != NULL;
}
+void __init mpc512x_generic_init_early(void)
+{
+ mpc512x_init_diu();
+}
+
+void __init mpc512x_generic_setup_arch(void)
+{
+ mpc512x_setup_diu();
+}
+
define_machine(mpc5121_generic) {
.name = "MPC5121 generic",
.probe = mpc5121_generic_probe,
.init = mpc512x_init,
+ .init_early = mpc512x_generic_init_early,
+ .setup_arch = mpc512x_generic_setup_arch,
.init_IRQ = mpc512x_init_IRQ,
.get_irq = ipic_get_irq,
.calibrate_decr = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
index d72b2c7..1cfe9d5 100644
--- a/arch/powerpc/platforms/512x/mpc512x.h
+++ b/arch/powerpc/platforms/512x/mpc512x.h
@@ -17,4 +17,7 @@ extern int __init mpc5121_clk_init(void);
void __init mpc512x_declare_of_platform_devices(void);
extern void mpc512x_restart(char *cmd);
extern void __init mpc5121_usb_init(void);
+extern void __init mpc512x_init_diu(void);
+extern void __init mpc512x_setup_diu(void);
+extern struct fsl_diu_shared_fb diu_shared_fb;
#endif /* __MPC512X_H__ */
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index fbdf65f..a8c50a6 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -16,7 +16,11 @@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/of_platform.h>
+#include <linux/fsl-diu-fb.h>
+#include <linux/bootmem.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/cacheflush.h>
#include <asm/machdep.h>
#include <asm/ipic.h>
#include <asm/prom.h>
@@ -53,6 +57,284 @@ void mpc512x_restart(char *cmd)
;
}
+struct fsl_diu_shared_fb {
+ char gamma[0x300]; /* 32-bit aligned! */
+ struct diu_ad ad0; /* 32-bit aligned! */
+ phys_addr_t fb_phys;
+ size_t fb_len;
+ bool in_use;
+};
+
+unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
+ int monitor_port)
+{
+ unsigned int pix_fmt;
+
+ switch (bits_per_pixel) {
+ case 32:
+ pix_fmt = 0x88883316;
+ break;
+ case 24:
+ pix_fmt = 0x88082219;
+ break;
+ case 16:
+ pix_fmt = 0x65053118;
+ break;
+ default:
+ pix_fmt = 0x00000400;
+ }
+ return pix_fmt;
+}
+
+void mpc512x_set_gamma_table(int monitor_port, char *gamma_table_base)
+{
+}
+
+void mpc512x_set_monitor_port(int monitor_port)
+{
+}
+
+#define CCM_SCFR1 0x0000000c
+#define DIU_DIV_MASK 0x000000ff
+void mpc512x_set_pixel_clock(unsigned int pixclock)
+{
+ unsigned long bestval, bestfreq, speed_ccb, busfreq;
+ unsigned long minpixclock, maxpixclock, pixval;
+ struct device_node *np;
+ void __iomem *ccm;
+ u32 temp;
+ long err;
+ int i;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-clock");
+ if (!np) {
+ pr_err("Can't find clock control module.\n");
+ return;
+ }
+
+ ccm = of_iomap(np, 0);
+ if (!ccm) {
+ pr_err("Can't map clock control module reg.\n");
+ of_node_put(np);
+ return;
+ }
+ of_node_put(np);
+
+ busfreq = 200000000;
+ np = of_find_node_by_type(NULL, "cpu");
+ if (np) {
+ unsigned int size;
+ const unsigned int *prop + of_get_property(np, "bus-frequency", &size);
+ if (prop)
+ busfreq = *prop;
+ of_node_put(np);
+ }
+
+ /* Pixel Clock configuration */
+ pr_debug("DIU: Bus Frequency = %lu\n", busfreq);
+ speed_ccb = busfreq * 4;
+
+ /* Calculate the pixel clock with the smallest error */
+ /* calculate the following in steps to avoid overflow */
+ pr_debug("DIU pixclock in ps - %d\n", pixclock);
+ temp = 1;
+ temp *= 1000000000;
+ temp /= pixclock;
+ temp *= 1000;
+ pixclock = temp;
+ pr_debug("DIU pixclock freq - %u\n", pixclock);
+
+ temp *= 5;
+ temp /= 100; /* pixclock * 0.05 */
+ pr_debug("deviation = %d\n", temp);
+ minpixclock = pixclock - temp;
+ maxpixclock = pixclock + temp;
+ pr_debug("DIU minpixclock - %lu\n", minpixclock);
+ pr_debug("DIU maxpixclock - %lu\n", maxpixclock);
+ pixval = speed_ccb/pixclock;
+ pr_debug("DIU pixval = %lu\n", pixval);
+
+ err = 100000000;
+ bestval = pixval;
+ pr_debug("DIU bestval = %lu\n", bestval);
+
+ bestfreq = 0;
+ for (i = -1; i <= 1; i++) {
+ temp = speed_ccb / (pixval+i);
+ pr_debug("DIU test pixval i=%d, pixval=%lu, temp freq. = %u\n",
+ i, pixval, temp);
+ if ((temp < minpixclock) || (temp > maxpixclock))
+ pr_debug("DIU exceeds monitor range (%lu to %lu)\n",
+ minpixclock, maxpixclock);
+ else if (abs(temp - pixclock) < err) {
+ pr_debug("Entered the else if block %d\n", i);
+ err = abs(temp - pixclock);
+ bestval = pixval + i;
+ bestfreq = temp;
+ }
+ }
+
+ pr_debug("DIU chose = %lx\n", bestval);
+ pr_debug("DIU error = %ld\n NomPixClk ", err);
+ pr_debug("DIU: Best Freq = %lx\n", bestfreq);
+ /* Modify DIU_DIV in CCM SCFR1 */
+ temp = in_be32(ccm + CCM_SCFR1);
+ pr_debug("DIU: Current value of SCFR1: 0x%08x\n", temp);
+ temp &= ~DIU_DIV_MASK;
+ temp |= (bestval & DIU_DIV_MASK);
+ out_be32(ccm + CCM_SCFR1, temp);
+ pr_debug("DIU: Modified value of SCFR1: 0x%08x\n", temp);
+ iounmap(ccm);
+}
+
+ssize_t mpc512x_show_monitor_port(int monitor_port, char *buf)
+{
+ return snprintf(buf, PAGE_SIZE, "0 - 5121 LCD\n");
+}
+
+int mpc512x_set_sysfs_monitor_port(int val)
+{
+ return 0;
+}
+
+struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
+EXPORT_SYMBOL_GPL(diu_shared_fb);
+
+#if defined(CONFIG_FB_FSL_DIU) || \
+ defined(CONFIG_FB_FSL_DIU_MODULE)
+static inline void mpc512x_free_bootmem(struct page *page)
+{
+ __ClearPageReserved(page);
+ BUG_ON(PageTail(page));
+ BUG_ON(atomic_read(&page->_count) > 1);
+ atomic_set(&page->_count, 1);
+ __free_page(page);
+ totalram_pages++;
+}
+
+void mpc512x_release_bootmem(void)
+{
+ unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK;
+ unsigned long size = diu_shared_fb.fb_len;
+ unsigned long start, end;
+
+ if (diu_shared_fb.in_use) {
+ start = PFN_UP(addr);
+ end = PFN_DOWN(addr + size);
+
+ for (; start < end; start++)
+ mpc512x_free_bootmem(pfn_to_page(start));
+
+ diu_shared_fb.in_use = false;
+ }
+ diu_ops.release_bootmem = NULL;
+}
+#endif
+
+/*
+ * Check if DIU was pre-initialized. If so, perform steps
+ * needed to continue displaying through the whole boot process.
+ * Move area descriptor and gamma table elsewhere, they are
+ * destroyed by bootmem allocator otherwise. The frame buffer
+ * address range will be reserved in setup_arch() after bootmem
+ * allocator is up.
+ */
+void __init mpc512x_init_diu(void)
+{
+ struct device_node *np;
+ void __iomem *diu_reg;
+ phys_addr_t desc;
+ void __iomem *vaddr;
+ unsigned long mode, pix_fmt, res, bpp;
+ unsigned long dst;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-diu");
+ if (!np) {
+ pr_err("No DIU node\n");
+ return;
+ }
+
+ diu_reg = of_iomap(np, 0);
+ of_node_put(np);
+ if (!diu_reg) {
+ pr_err("Can't map DIU\n");
+ return;
+ }
+
+ mode = in_be32(diu_reg + 0x1c);
+ if (mode != 1) {
+ pr_info("%s: DIU OFF\n", __func__);
+ goto out;
+ }
+
+ desc = in_be32(diu_reg);
+ vaddr = ioremap(desc, sizeof(struct diu_ad));
+ if (!vaddr) {
+ pr_err("Can't map DIU area desc.\n");
+ goto out;
+ }
+ memcpy(&diu_shared_fb.ad0, vaddr, sizeof(struct diu_ad));
+ /* flush fb area descriptor */
+ dst = (unsigned long)&diu_shared_fb.ad0;
+ flush_dcache_range(dst, dst + sizeof(struct diu_ad) - 1);
+
+ res = in_be32(diu_reg + 0x28);
+ pix_fmt = in_le32(vaddr);
+ bpp = ((pix_fmt >> 16) & 0x3) + 1;
+ diu_shared_fb.fb_phys = in_le32(vaddr + 4);
+ diu_shared_fb.fb_len = ((res & 0xfff0000) >> 16) * (res & 0xfff) * bpp;
+ diu_shared_fb.in_use = true;
+ iounmap(vaddr);
+
+ desc = in_be32(diu_reg + 0xc);
+ vaddr = ioremap(desc, sizeof(diu_shared_fb.gamma));
+ if (!vaddr) {
+ pr_err("Can't map DIU area desc.\n");
+ diu_shared_fb.in_use = false;
+ goto out;
+ }
+ memcpy(&diu_shared_fb.gamma, vaddr, sizeof(diu_shared_fb.gamma));
+ /* flush gamma table */
+ dst = (unsigned long)&diu_shared_fb.gamma;
+ flush_dcache_range(dst, dst + sizeof(diu_shared_fb.gamma) - 1);
+
+ iounmap(vaddr);
+ out_be32(diu_reg + 0xc, virt_to_phys(&diu_shared_fb.gamma));
+ out_be32(diu_reg + 4, 0);
+ out_be32(diu_reg + 8, 0);
+ out_be32(diu_reg, virt_to_phys(&diu_shared_fb.ad0));
+
+out:
+ iounmap(diu_reg);
+}
+
+void __init mpc512x_setup_diu(void)
+{
+ int ret;
+
+ if (diu_shared_fb.in_use) {
+ ret = reserve_bootmem(diu_shared_fb.fb_phys,
+ diu_shared_fb.fb_len,
+ BOOTMEM_EXCLUSIVE);
+ if (ret) {
+ pr_err("%s: reserve bootmem failed\n", __func__);
+ diu_shared_fb.in_use = false;
+ }
+ }
+
+#if defined(CONFIG_FB_FSL_DIU) || \
+ defined(CONFIG_FB_FSL_DIU_MODULE)
+ diu_ops.get_pixel_format = mpc512x_get_pixel_format;
+ diu_ops.set_gamma_table = mpc512x_set_gamma_table;
+ diu_ops.set_monitor_port = mpc512x_set_monitor_port;
+ diu_ops.set_pixel_clock = mpc512x_set_pixel_clock;
+ diu_ops.show_monitor_port = mpc512x_show_monitor_port;
+ diu_ops.set_sysfs_monitor_port = mpc512x_set_sysfs_monitor_port;
+ diu_ops.release_bootmem = mpc512x_release_bootmem;
+#endif
+}
+
void __init mpc512x_init_IRQ(void)
{
struct device_node *np;
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 19754be..346057d 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -30,6 +30,7 @@ struct platform_diu_data_ops {
void (*set_pixel_clock) (unsigned int pixclock);
ssize_t (*show_monitor_port) (int monitor_port, char *buf);
int (*set_sysfs_monitor_port) (int val);
+ void (*release_bootmem) (void);
};
extern struct platform_diu_data_ops diu_ops;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 19ca1da..263f7da 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -34,7 +34,7 @@
#include <linux/of_platform.h>
#include <sysdev/fsl_soc.h>
-#include "fsl-diu-fb.h"
+#include <linux/fsl-diu-fb.h>
#include "ofmode.h"
@@ -331,8 +331,11 @@ static int fsl_diu_enable_panel(struct fb_info *info)
if (mfbi->type != MFB_TYPE_OFF) {
switch (mfbi->index) {
case 0: /* plane 0 */
- if (hw->desc[0] != ad->paddr)
+ if (in_be32(&hw->desc[0]) != ad->paddr) {
+ out_be32(&dr.diu_reg->diu_mode, 0);
out_be32(&hw->desc[0], ad->paddr);
+ out_be32(&dr.diu_reg->diu_mode, 1);
+ }
break;
case 1: /* plane 1 AOI 0 */
cmfbi = machine_data->fsl_diu_info[2]->par;
@@ -391,7 +394,7 @@ static int fsl_diu_disable_panel(struct fb_info *info)
switch (mfbi->index) {
case 0: /* plane 0 */
- if (hw->desc[0] != machine_data->dummy_ad->paddr)
+ if (in_be32(&hw->desc[0]) != machine_data->dummy_ad->paddr)
out_be32(&hw->desc[0],
machine_data->dummy_ad->paddr);
break;
@@ -1102,6 +1105,10 @@ static int fsl_diu_open(struct fb_info *info, int user)
struct mfb_info *mfbi = info->par;
int res = 0;
+ /* free boot splash memory on first /dev/fb0 open */
+ if (!mfbi->index && diu_ops.release_bootmem)
+ diu_ops.release_bootmem();
+
spin_lock(&diu_lock);
mfbi->count++;
if (mfbi->count = 1) {
@@ -1436,6 +1443,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
int ret, i, error = 0;
struct resource res;
struct fsl_diu_data *machine_data;
+ int diu_mode;
machine_data = kzalloc(sizeof(struct fsl_diu_data), GFP_KERNEL);
if (!machine_data)
@@ -1472,7 +1480,9 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
goto error2;
}
- out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU anyway*/
+ diu_mode = in_be32(&dr.diu_reg->diu_mode);
+ if (diu_mode != MFB_MODE1)
+ out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU */
/* Get the IRQ of the DIU */
machine_data->irq = irq_of_parse_and_map(np, 0);
@@ -1520,7 +1530,12 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
machine_data->dummy_ad->offset_xyd = 0;
machine_data->dummy_ad->next_ad = 0;
- out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
+ /* Let DIU display splash screen if it was pre-initialized
+ * by the bootloader, set dummy area descriptor otherwise.
+ */
+ if (diu_mode != MFB_MODE1)
+ out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
+
out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr);
out_be32(&dr.diu_reg->desc[2], machine_data->dummy_ad->paddr);
diff --git a/drivers/video/fsl-diu-fb.h b/drivers/video/fsl-diu-fb.h
deleted file mode 100644
index fc295d7..0000000
--- a/drivers/video/fsl-diu-fb.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * Freescale DIU Frame Buffer device driver
- *
- * Authors: Hongjun Chen <hong-jun.chen@freescale.com>
- * Paul Widmer <paul.widmer@freescale.com>
- * Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
- * York Sun <yorksun@freescale.com>
- *
- * Based on imxfb.c Copyright (C) 2004 S.Hauer, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- */
-
-#ifndef __FSL_DIU_FB_H__
-#define __FSL_DIU_FB_H__
-
-/* Arbitrary threshold to determine the allocation method
- * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
- */
-#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
-/* Minimum value that the pixel clock can be set to in pico seconds
- * This is determined by platform clock/3 where the minimum platform
- * clock is 533MHz. This gives 5629 pico seconds.
- */
-#define MIN_PIX_CLK 5629
-#define MAX_PIX_CLK 96096
-
-#include <linux/types.h>
-
-struct mfb_alpha {
- int enable;
- int alpha;
-};
-
-struct mfb_chroma_key {
- int enable;
- __u8 red_max;
- __u8 green_max;
- __u8 blue_max;
- __u8 red_min;
- __u8 green_min;
- __u8 blue_min;
-};
-
-struct aoi_display_offset {
- int x_aoi_d;
- int y_aoi_d;
-};
-
-#define MFB_SET_CHROMA_KEY _IOW('M', 1, struct mfb_chroma_key)
-#define MFB_WAIT_FOR_VSYNC _IOW('F', 0x20, u_int32_t)
-#define MFB_SET_BRIGHTNESS _IOW('M', 3, __u8)
-
-#define MFB_SET_ALPHA 0x80014d00
-#define MFB_GET_ALPHA 0x40014d00
-#define MFB_SET_AOID 0x80084d04
-#define MFB_GET_AOID 0x40084d04
-#define MFB_SET_PIXFMT 0x80014d08
-#define MFB_GET_PIXFMT 0x40014d08
-
-#define FBIOGET_GWINFO 0x46E0
-#define FBIOPUT_GWINFO 0x46E1
-
-#ifdef __KERNEL__
-#include <linux/spinlock.h>
-
-/*
- * These are the fields of area descriptor(in DDR memory) for every plane
- */
-struct diu_ad {
- /* Word 0(32-bit) in DDR memory */
-/* __u16 comp; */
-/* __u16 pixel_s:2; */
-/* __u16 pallete:1; */
-/* __u16 red_c:2; */
-/* __u16 green_c:2; */
-/* __u16 blue_c:2; */
-/* __u16 alpha_c:3; */
-/* __u16 byte_f:1; */
-/* __u16 res0:3; */
-
- __be32 pix_fmt; /* hard coding pixel format */
-
- /* Word 1(32-bit) in DDR memory */
- __le32 addr;
-
- /* Word 2(32-bit) in DDR memory */
-/* __u32 delta_xs:11; */
-/* __u32 res1:1; */
-/* __u32 delta_ys:11; */
-/* __u32 res2:1; */
-/* __u32 g_alpha:8; */
- __le32 src_size_g_alpha;
-
- /* Word 3(32-bit) in DDR memory */
-/* __u32 delta_xi:11; */
-/* __u32 res3:5; */
-/* __u32 delta_yi:11; */
-/* __u32 res4:3; */
-/* __u32 flip:2; */
- __le32 aoi_size;
-
- /* Word 4(32-bit) in DDR memory */
- /*__u32 offset_xi:11;
- __u32 res5:5;
- __u32 offset_yi:11;
- __u32 res6:5;
- */
- __le32 offset_xyi;
-
- /* Word 5(32-bit) in DDR memory */
- /*__u32 offset_xd:11;
- __u32 res7:5;
- __u32 offset_yd:11;
- __u32 res8:5; */
- __le32 offset_xyd;
-
-
- /* Word 6(32-bit) in DDR memory */
- __u8 ckmax_r;
- __u8 ckmax_g;
- __u8 ckmax_b;
- __u8 res9;
-
- /* Word 7(32-bit) in DDR memory */
- __u8 ckmin_r;
- __u8 ckmin_g;
- __u8 ckmin_b;
- __u8 res10;
-/* __u32 res10:8; */
-
- /* Word 8(32-bit) in DDR memory */
- __le32 next_ad;
-
- /* Word 9(32-bit) in DDR memory, just for 64-bit aligned */
- __u32 paddr;
-} __attribute__ ((packed));
-
-/* DIU register map */
-struct diu {
- __be32 desc[3];
- __be32 gamma;
- __be32 pallete;
- __be32 cursor;
- __be32 curs_pos;
- __be32 diu_mode;
- __be32 bgnd;
- __be32 bgnd_wb;
- __be32 disp_size;
- __be32 wb_size;
- __be32 wb_mem_addr;
- __be32 hsyn_para;
- __be32 vsyn_para;
- __be32 syn_pol;
- __be32 thresholds;
- __be32 int_status;
- __be32 int_mask;
- __be32 colorbar[8];
- __be32 filling;
- __be32 plut;
-} __attribute__ ((packed));
-
-struct diu_hw {
- struct diu *diu_reg;
- spinlock_t reg_lock;
-
- __u32 mode; /* DIU operation mode */
-};
-
-struct diu_addr {
- __u8 __iomem *vaddr; /* Virtual address */
- dma_addr_t paddr; /* Physical address */
- __u32 offset;
-};
-
-struct diu_pool {
- struct diu_addr ad;
- struct diu_addr gamma;
- struct diu_addr pallete;
- struct diu_addr cursor;
-};
-
-#define FSL_DIU_BASE_OFFSET 0x2C000 /* Offset of DIU */
-#define INT_LCDC 64 /* DIU interrupt number */
-
-#define FSL_AOI_NUM 6 /* 5 AOIs and one dummy AOI */
- /* 1 for plane 0, 2 for plane 1&2 each */
-
-/* Minimum X and Y resolutions */
-#define MIN_XRES 64
-#define MIN_YRES 64
-
-/* HW cursor parameters */
-#define MAX_CURS 32
-
-/* Modes of operation of DIU */
-#define MFB_MODE0 0 /* DIU off */
-#define MFB_MODE1 1 /* All three planes output to display */
-#define MFB_MODE2 2 /* Plane 1 to display, planes 2+3 written back*/
-#define MFB_MODE3 3 /* All three planes written back to memory */
-#define MFB_MODE4 4 /* Color bar generation */
-
-/* INT_STATUS/INT_MASK field descriptions */
-#define INT_VSYNC 0x01 /* Vsync interrupt */
-#define INT_VSYNC_WB 0x02 /* Vsync interrupt for write back operation */
-#define INT_UNDRUN 0x04 /* Under run exception interrupt */
-#define INT_PARERR 0x08 /* Display parameters error interrupt */
-#define INT_LS_BF_VS 0x10 /* Lines before vsync. interrupt */
-
-/* Panels'operation modes */
-#define MFB_TYPE_OUTPUT 0 /* Panel output to display */
-#define MFB_TYPE_OFF 1 /* Panel off */
-#define MFB_TYPE_WB 2 /* Panel written back to memory */
-#define MFB_TYPE_TEST 3 /* Panel generate color bar */
-
-#endif /* __KERNEL__ */
-#endif /* __FSL_DIU_FB_H__ */
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h
new file mode 100644
index 0000000..fc295d7
--- /dev/null
+++ b/include/linux/fsl-diu-fb.h
@@ -0,0 +1,223 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * Freescale DIU Frame Buffer device driver
+ *
+ * Authors: Hongjun Chen <hong-jun.chen@freescale.com>
+ * Paul Widmer <paul.widmer@freescale.com>
+ * Srikanth Srinivasan <srikanth.srinivasan@freescale.com>
+ * York Sun <yorksun@freescale.com>
+ *
+ * Based on imxfb.c Copyright (C) 2004 S.Hauer, Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ */
+
+#ifndef __FSL_DIU_FB_H__
+#define __FSL_DIU_FB_H__
+
+/* Arbitrary threshold to determine the allocation method
+ * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory()
+ */
+#define MEM_ALLOC_THRESHOLD (1024*768*4+32)
+/* Minimum value that the pixel clock can be set to in pico seconds
+ * This is determined by platform clock/3 where the minimum platform
+ * clock is 533MHz. This gives 5629 pico seconds.
+ */
+#define MIN_PIX_CLK 5629
+#define MAX_PIX_CLK 96096
+
+#include <linux/types.h>
+
+struct mfb_alpha {
+ int enable;
+ int alpha;
+};
+
+struct mfb_chroma_key {
+ int enable;
+ __u8 red_max;
+ __u8 green_max;
+ __u8 blue_max;
+ __u8 red_min;
+ __u8 green_min;
+ __u8 blue_min;
+};
+
+struct aoi_display_offset {
+ int x_aoi_d;
+ int y_aoi_d;
+};
+
+#define MFB_SET_CHROMA_KEY _IOW('M', 1, struct mfb_chroma_key)
+#define MFB_WAIT_FOR_VSYNC _IOW('F', 0x20, u_int32_t)
+#define MFB_SET_BRIGHTNESS _IOW('M', 3, __u8)
+
+#define MFB_SET_ALPHA 0x80014d00
+#define MFB_GET_ALPHA 0x40014d00
+#define MFB_SET_AOID 0x80084d04
+#define MFB_GET_AOID 0x40084d04
+#define MFB_SET_PIXFMT 0x80014d08
+#define MFB_GET_PIXFMT 0x40014d08
+
+#define FBIOGET_GWINFO 0x46E0
+#define FBIOPUT_GWINFO 0x46E1
+
+#ifdef __KERNEL__
+#include <linux/spinlock.h>
+
+/*
+ * These are the fields of area descriptor(in DDR memory) for every plane
+ */
+struct diu_ad {
+ /* Word 0(32-bit) in DDR memory */
+/* __u16 comp; */
+/* __u16 pixel_s:2; */
+/* __u16 pallete:1; */
+/* __u16 red_c:2; */
+/* __u16 green_c:2; */
+/* __u16 blue_c:2; */
+/* __u16 alpha_c:3; */
+/* __u16 byte_f:1; */
+/* __u16 res0:3; */
+
+ __be32 pix_fmt; /* hard coding pixel format */
+
+ /* Word 1(32-bit) in DDR memory */
+ __le32 addr;
+
+ /* Word 2(32-bit) in DDR memory */
+/* __u32 delta_xs:11; */
+/* __u32 res1:1; */
+/* __u32 delta_ys:11; */
+/* __u32 res2:1; */
+/* __u32 g_alpha:8; */
+ __le32 src_size_g_alpha;
+
+ /* Word 3(32-bit) in DDR memory */
+/* __u32 delta_xi:11; */
+/* __u32 res3:5; */
+/* __u32 delta_yi:11; */
+/* __u32 res4:3; */
+/* __u32 flip:2; */
+ __le32 aoi_size;
+
+ /* Word 4(32-bit) in DDR memory */
+ /*__u32 offset_xi:11;
+ __u32 res5:5;
+ __u32 offset_yi:11;
+ __u32 res6:5;
+ */
+ __le32 offset_xyi;
+
+ /* Word 5(32-bit) in DDR memory */
+ /*__u32 offset_xd:11;
+ __u32 res7:5;
+ __u32 offset_yd:11;
+ __u32 res8:5; */
+ __le32 offset_xyd;
+
+
+ /* Word 6(32-bit) in DDR memory */
+ __u8 ckmax_r;
+ __u8 ckmax_g;
+ __u8 ckmax_b;
+ __u8 res9;
+
+ /* Word 7(32-bit) in DDR memory */
+ __u8 ckmin_r;
+ __u8 ckmin_g;
+ __u8 ckmin_b;
+ __u8 res10;
+/* __u32 res10:8; */
+
+ /* Word 8(32-bit) in DDR memory */
+ __le32 next_ad;
+
+ /* Word 9(32-bit) in DDR memory, just for 64-bit aligned */
+ __u32 paddr;
+} __attribute__ ((packed));
+
+/* DIU register map */
+struct diu {
+ __be32 desc[3];
+ __be32 gamma;
+ __be32 pallete;
+ __be32 cursor;
+ __be32 curs_pos;
+ __be32 diu_mode;
+ __be32 bgnd;
+ __be32 bgnd_wb;
+ __be32 disp_size;
+ __be32 wb_size;
+ __be32 wb_mem_addr;
+ __be32 hsyn_para;
+ __be32 vsyn_para;
+ __be32 syn_pol;
+ __be32 thresholds;
+ __be32 int_status;
+ __be32 int_mask;
+ __be32 colorbar[8];
+ __be32 filling;
+ __be32 plut;
+} __attribute__ ((packed));
+
+struct diu_hw {
+ struct diu *diu_reg;
+ spinlock_t reg_lock;
+
+ __u32 mode; /* DIU operation mode */
+};
+
+struct diu_addr {
+ __u8 __iomem *vaddr; /* Virtual address */
+ dma_addr_t paddr; /* Physical address */
+ __u32 offset;
+};
+
+struct diu_pool {
+ struct diu_addr ad;
+ struct diu_addr gamma;
+ struct diu_addr pallete;
+ struct diu_addr cursor;
+};
+
+#define FSL_DIU_BASE_OFFSET 0x2C000 /* Offset of DIU */
+#define INT_LCDC 64 /* DIU interrupt number */
+
+#define FSL_AOI_NUM 6 /* 5 AOIs and one dummy AOI */
+ /* 1 for plane 0, 2 for plane 1&2 each */
+
+/* Minimum X and Y resolutions */
+#define MIN_XRES 64
+#define MIN_YRES 64
+
+/* HW cursor parameters */
+#define MAX_CURS 32
+
+/* Modes of operation of DIU */
+#define MFB_MODE0 0 /* DIU off */
+#define MFB_MODE1 1 /* All three planes output to display */
+#define MFB_MODE2 2 /* Plane 1 to display, planes 2+3 written back*/
+#define MFB_MODE3 3 /* All three planes written back to memory */
+#define MFB_MODE4 4 /* Color bar generation */
+
+/* INT_STATUS/INT_MASK field descriptions */
+#define INT_VSYNC 0x01 /* Vsync interrupt */
+#define INT_VSYNC_WB 0x02 /* Vsync interrupt for write back operation */
+#define INT_UNDRUN 0x04 /* Under run exception interrupt */
+#define INT_PARERR 0x08 /* Display parameters error interrupt */
+#define INT_LS_BF_VS 0x10 /* Lines before vsync. interrupt */
+
+/* Panels'operation modes */
+#define MFB_TYPE_OUTPUT 0 /* Panel output to display */
+#define MFB_TYPE_OFF 1 /* Panel off */
+#define MFB_TYPE_WB 2 /* Panel written back to memory */
+#define MFB_TYPE_TEST 3 /* Panel generate color bar */
+
+#endif /* __KERNEL__ */
+#endif /* __FSL_DIU_FB_H__ */
--
1.6.3.3
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from device
2010-02-27 21:58 ` [PATCH 1/3] video: add support for getting video mode from device tree Anatolij Gustschin
@ 2010-02-28 6:30 ` Grant Likely
[not found] ` <fa686aa41002272230s7f900c0fv1aabf0e26ccbf84c-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 15+ messages in thread
From: Grant Likely @ 2010-02-28 6:30 UTC (permalink / raw)
To: Anatolij Gustschin
Cc: linux-fbdev, wd, dzu, jrigby, devicetree-discuss, linuxppc-dev, yorksun
Hi Anatolij,
[added cc: to devicetree-discuss@lists.ozlabs.org]
On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> Framebuffer drivers may want to get panel timing info
> from the device tree. This patch adds appropriate support.
> Subsequent patch for FSL DIU frame buffer driver makes use
> of this functionality.
I think this is moving in the right direction, but there needs to
debate & review over the binding before committing to anything.
Please write a patch that documents the new binding in
Documentation/powerpc/dts-bindings. All new bindings should be
documented and reviewed on devicetree-discuss before merging any
drivers that use them into mainline.
From what I can tell by reading your code, I suspect that the binding
you've designed will solve your immediate problem, but won't be able
to handle anything slightly more complex, but it also looks like the
binding has been designed to be generic, usable by any display device.
First off, I did a tiny amount of research, and I didn't find any
existing OpenFirmware bindings for describing video displays.
Otherwise, I'd suggest considering that.
From the little bit that I know, it seems that for most video devices
(ie. PCs) the video card discovers the capabilities of the screen by
reading the monitor's EDID data. However, in your particular case
embedded case, a fixed flat panel is attached, and there isn't any
EDID data provided. Therefore, you need an alternate method of
describing the display capabilities. Rather than designing something
entirely new, you may want to consider using the EDID data format
directly; or at least cover the same things that EDID describes. The
downside to using EDID directly is that it is a packed binary format
that isn't parseable by mere mortals; but the data contained in it
seems about right. The upside is the kernel already knows what to do
with EDID data.
Otherwise you risk designing something that won't be useful for
anything much outside of your own use case. For example, the binding
I see from the code cannot handle a display with multiple output
modes.
Also, since you're now in the realm of describing a video display,
which is separate from the display controller, you should consider
describing the display in a separate device tree node. Maybe
something like this...
video {
compatible = "fsl,mpc5121-diu";
display {
compatible = "<vendor>,<model>";
edid = [edid-data];
};
};
Cheers,
g.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> drivers/video/Kconfig | 5 +++
> drivers/video/Makefile | 1 +
> drivers/video/ofmode.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++
> drivers/video/ofmode.h | 6 +++
> 4 files changed, 107 insertions(+), 0 deletions(-)
> create mode 100644 drivers/video/ofmode.c
> create mode 100644 drivers/video/ofmode.h
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index 5a5c303..dc1beb0 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -203,6 +203,11 @@ config FB_MACMODES
> depends on FB
> default n
>
> +config FB_OF_MODE
> + tristate
> + depends on FB && OF
> + default n
> +
> config FB_BACKLIGHT
> bool
> depends on FB
> diff --git a/drivers/video/Makefile b/drivers/video/Makefile
> index 4ecb30c..c4a912b 100644
> --- a/drivers/video/Makefile
> +++ b/drivers/video/Makefile
> @@ -26,6 +26,7 @@ obj-$(CONFIG_FB_SVGALIB) += svgalib.o
> obj-$(CONFIG_FB_MACMODES) += macmodes.o
> obj-$(CONFIG_FB_DDC) += fb_ddc.o
> obj-$(CONFIG_FB_DEFERRED_IO) += fb_defio.o
> +obj-$(CONFIG_FB_OF_MODE) += ofmode.o
>
> # Hardware specific drivers go first
> obj-$(CONFIG_FB_AMIGA) += amifb.o c2p_planar.o
> diff --git a/drivers/video/ofmode.c b/drivers/video/ofmode.c
> new file mode 100644
> index 0000000..78caad1
> --- /dev/null
> +++ b/drivers/video/ofmode.c
> @@ -0,0 +1,95 @@
> +/*
> + * Get video mode settings from Flattened Device Tree.
> + *
> + * Copyright (C) 2010 DENX Software Engineering.
> + * Anatolij Gustschin <agust@denx.de>
> + *
> + * This file is subject to the terms and conditions of the GNU General
> + * Public License version 2. See the file COPYING in the main directory
> + * of this archive for more details.
> + */
> +
> +#include <linux/fb.h>
> +#include <linux/of.h>
> +
> +int __devinit of_get_video_mode(struct device_node *np,
> + struct fb_info *info)
> +{
> + struct fb_videomode dt_mode;
> + const u32 *prop;
> + unsigned int len;
> +
> + if (!np || !info)
> + return -EINVAL;
> +
> + prop = of_get_property(np, "width", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.xres = *prop;
> +
> + prop = of_get_property(np, "height", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.yres = *prop;
> +
> + prop = of_get_property(np, "depth", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + info->var.bits_per_pixel = *prop;
> +
> + prop = of_get_property(np, "linebytes", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + info->fix.line_length = *prop;
> +
> + prop = of_get_property(np, "refresh", &len);
> + if (prop && len = sizeof(u32))
> + dt_mode.refresh = *prop; /* optional */
> +
> + prop = of_get_property(np, "pixclock", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.pixclock = *prop;
> +
> + prop = of_get_property(np, "left_margin", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.left_margin = *prop;
> +
> + prop = of_get_property(np, "right_margin", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.right_margin = *prop;
> +
> + prop = of_get_property(np, "upper_margin", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.upper_margin = *prop;
> +
> + prop = of_get_property(np, "lower_margin", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.lower_margin = *prop;
> +
> + prop = of_get_property(np, "hsync_len", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.hsync_len = *prop;
> +
> + prop = of_get_property(np, "vsync_len", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.vsync_len = *prop;
> +
> + prop = of_get_property(np, "sync", &len);
> + if (!prop || len != sizeof(u32))
> + goto err;
> + dt_mode.sync = *prop;
> +
> + fb_videomode_to_var(&info->var, &dt_mode);
> +
> + return 0;
> +err:
> + pr_err("%s: Can't find expected mode entry\n", np->full_name);
> + return -EINVAL;
> +}
> diff --git a/drivers/video/ofmode.h b/drivers/video/ofmode.h
> new file mode 100644
> index 0000000..9a13bec
> --- /dev/null
> +++ b/drivers/video/ofmode.h
> @@ -0,0 +1,6 @@
> +#ifndef _OFMODE_H
> +#define _OFMODE_H
> +
> +extern int __devinit of_get_video_mode(struct device_node *np,
> + struct fb_info *info);
> +#endif
> --
> 1.6.3.3
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support
2010-02-27 21:58 ` [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support Anatolij Gustschin
@ 2010-02-28 6:50 ` Grant Likely
2010-04-28 20:28 ` Anatolij Gustschin
0 siblings, 1 reply; 15+ messages in thread
From: Grant Likely @ 2010-02-28 6:50 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fbdev, wd, dzu, jrigby, linuxppc-dev, yorksun
On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> MPC5121 DIU configuration/setup as initialized by the boot
> loader currently will get lost while booting Linux. As a
> result displaying the boot splash is not possible through
> the boot process.
>
> To prevent this we reserve configured DIU frame buffer
> address range while booting and preserve AOI descriptor
> and gamma table so that DIU continues displaying through
> the whole boot process. On first open from user space
> DIU frame buffer driver releases the reserved frame
> buffer area and continues to operate as usual.
>
> The patch also moves drivers/video/fsl-diu-fb.h file to
> include/linux as we use some DIU structures in platform
> code.
>
> 'diu_ops' callbacks in platform code borrowed from John's
> DIU code.
>
> Signed-off-by: John Rigby <jrigby@gmail.com>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
On quick glance this patch seems mostly okay, but this patch should
probably be broken up a bit to simplify review and dissociate
unrelated changes. For example, the move of fsl-diu-fb.h is a
discrete change that should be split off. Some more comments
below....
> ---
> arch/powerpc/platforms/512x/mpc5121_ads.c | 7 +
> arch/powerpc/platforms/512x/mpc5121_generic.c | 13 ++
> arch/powerpc/platforms/512x/mpc512x.h | 3 +
> arch/powerpc/platforms/512x/mpc512x_shared.c | 282 +++++++++++++++++++++++++
> arch/powerpc/sysdev/fsl_soc.h | 1 +
> drivers/video/fsl-diu-fb.c | 25 ++-
> drivers/video/fsl-diu-fb.h | 223 -------------------
> include/linux/fsl-diu-fb.h | 223 +++++++++++++++++++
> 8 files changed, 549 insertions(+), 228 deletions(-)
> delete mode 100644 drivers/video/fsl-diu-fb.h
> create mode 100644 include/linux/fsl-diu-fb.h
>
> diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
> index ee6ae12..aa4d5a8 100644
> --- a/arch/powerpc/platforms/512x/mpc5121_ads.c
> +++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
> @@ -42,6 +42,7 @@ static void __init mpc5121_ads_setup_arch(void)
> for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")
> mpc83xx_add_bridge(np);
> #endif
> + mpc512x_setup_diu();
> }
>
> static void __init mpc5121_ads_init_IRQ(void)
> @@ -60,11 +61,17 @@ static int __init mpc5121_ads_probe(void)
> return of_flat_dt_is_compatible(root, "fsl,mpc5121ads");
> }
>
> +void __init mpc5121_ads_init_early(void)
> +{
> + mpc512x_init_diu();
> +}
> +
> define_machine(mpc5121_ads) {
> .name = "MPC5121 ADS",
> .probe = mpc5121_ads_probe,
> .setup_arch = mpc5121_ads_setup_arch,
> .init = mpc512x_init,
> + .init_early = mpc5121_ads_init_early,
> .init_IRQ = mpc5121_ads_init_IRQ,
> .get_irq = ipic_get_irq,
> .calibrate_decr = generic_calibrate_decr,
> diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
> index a6c0e3a..3aaa281 100644
> --- a/arch/powerpc/platforms/512x/mpc5121_generic.c
> +++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
> @@ -28,6 +28,7 @@
> */
> static char *board[] __initdata = {
> "prt,prtlvt",
> + "ifm,pdm360ng",
You're adding a new board here. This is completely unrelated.
> NULL
> };
>
> @@ -48,10 +49,22 @@ static int __init mpc5121_generic_probe(void)
> return board[i] != NULL;
> }
>
> +void __init mpc512x_generic_init_early(void)
> +{
> + mpc512x_init_diu();
> +}
> +
> +void __init mpc512x_generic_setup_arch(void)
> +{
> + mpc512x_setup_diu();
> +}
> +
> define_machine(mpc5121_generic) {
> .name = "MPC5121 generic",
> .probe = mpc5121_generic_probe,
> .init = mpc512x_init,
> + .init_early = mpc512x_generic_init_early,
> + .setup_arch = mpc512x_generic_setup_arch,
> .init_IRQ = mpc512x_init_IRQ,
> .get_irq = ipic_get_irq,
> .calibrate_decr = generic_calibrate_decr,
> diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
> index d72b2c7..1cfe9d5 100644
> --- a/arch/powerpc/platforms/512x/mpc512x.h
> +++ b/arch/powerpc/platforms/512x/mpc512x.h
> @@ -17,4 +17,7 @@ extern int __init mpc5121_clk_init(void);
> void __init mpc512x_declare_of_platform_devices(void);
> extern void mpc512x_restart(char *cmd);
> extern void __init mpc5121_usb_init(void);
> +extern void __init mpc512x_init_diu(void);
> +extern void __init mpc512x_setup_diu(void);
__init annotations do not belong in header files.
> +extern struct fsl_diu_shared_fb diu_shared_fb;
Hmmmm. I'm not fond of the global data structure. Especially
considering that the struct fsl_diu_shared_fb is defined in
mpc512x_shared.c, so nothing outside of that .c file can do anything
with the structure.
> #endif /* __MPC512X_H__ */
> diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
> index fbdf65f..a8c50a6 100644
> --- a/arch/powerpc/platforms/512x/mpc512x_shared.c
> +++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
> @@ -16,7 +16,11 @@
> #include <linux/io.h>
> #include <linux/irq.h>
> #include <linux/of_platform.h>
> +#include <linux/fsl-diu-fb.h>
> +#include <linux/bootmem.h>
> +#include <sysdev/fsl_soc.h>
>
> +#include <asm/cacheflush.h>
> #include <asm/machdep.h>
> #include <asm/ipic.h>
> #include <asm/prom.h>
> @@ -53,6 +57,284 @@ void mpc512x_restart(char *cmd)
> ;
> }
>
> +struct fsl_diu_shared_fb {
> + char gamma[0x300]; /* 32-bit aligned! */
> + struct diu_ad ad0; /* 32-bit aligned! */
> + phys_addr_t fb_phys;
> + size_t fb_len;
> + bool in_use;
> +};
> +
> +unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
> + int monitor_port)
> +{
> + unsigned int pix_fmt;
> +
> + switch (bits_per_pixel) {
> + case 32:
> + pix_fmt = 0x88883316;
> + break;
> + case 24:
> + pix_fmt = 0x88082219;
> + break;
> + case 16:
> + pix_fmt = 0x65053118;
> + break;
> + default:
> + pix_fmt = 0x00000400;
> + }
> + return pix_fmt;
> +}
> +
> +void mpc512x_set_gamma_table(int monitor_port, char *gamma_table_base)
> +{
> +}
> +
> +void mpc512x_set_monitor_port(int monitor_port)
> +{
> +}
> +
> +#define CCM_SCFR1 0x0000000c
> +#define DIU_DIV_MASK 0x000000ff
> +void mpc512x_set_pixel_clock(unsigned int pixclock)
> +{
> + unsigned long bestval, bestfreq, speed_ccb, busfreq;
> + unsigned long minpixclock, maxpixclock, pixval;
> + struct device_node *np;
> + void __iomem *ccm;
> + u32 temp;
> + long err;
> + int i;
> +
> + np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-clock");
> + if (!np) {
> + pr_err("Can't find clock control module.\n");
> + return;
> + }
> +
> + ccm = of_iomap(np, 0);
> + if (!ccm) {
> + pr_err("Can't map clock control module reg.\n");
> + of_node_put(np);
> + return;
> + }
> + of_node_put(np);
> +
> + busfreq = 200000000;
Instead of some hard coding some bogus defalt busfreq, you should
error out if the real frequency cannot be determined. Force users to
supply a valid tree.
> + np = of_find_node_by_type(NULL, "cpu");
> + if (np) {
> + unsigned int size;
> + const unsigned int *prop > + of_get_property(np, "bus-frequency", &size);
> + if (prop)
> + busfreq = *prop;
> + of_node_put(np);
> + }
> +
> + /* Pixel Clock configuration */
> + pr_debug("DIU: Bus Frequency = %lu\n", busfreq);
> + speed_ccb = busfreq * 4;
> +
> + /* Calculate the pixel clock with the smallest error */
> + /* calculate the following in steps to avoid overflow */
> + pr_debug("DIU pixclock in ps - %d\n", pixclock);
> + temp = 1;
> + temp *= 1000000000;
> + temp /= pixclock;
> + temp *= 1000;
> + pixclock = temp;
Really? I think you can simplify this.
> + pr_debug("DIU pixclock freq - %u\n", pixclock);
> +
> + temp *= 5;
> + temp /= 100; /* pixclock * 0.05 */
> + pr_debug("deviation = %d\n", temp);
> + minpixclock = pixclock - temp;
> + maxpixclock = pixclock + temp;
> + pr_debug("DIU minpixclock - %lu\n", minpixclock);
> + pr_debug("DIU maxpixclock - %lu\n", maxpixclock);
> + pixval = speed_ccb/pixclock;
> + pr_debug("DIU pixval = %lu\n", pixval);
> +
> + err = 100000000;
> + bestval = pixval;
> + pr_debug("DIU bestval = %lu\n", bestval);
> +
> + bestfreq = 0;
> + for (i = -1; i <= 1; i++) {
> + temp = speed_ccb / (pixval+i);
> + pr_debug("DIU test pixval i=%d, pixval=%lu, temp freq. = %u\n",
> + i, pixval, temp);
> + if ((temp < minpixclock) || (temp > maxpixclock))
> + pr_debug("DIU exceeds monitor range (%lu to %lu)\n",
> + minpixclock, maxpixclock);
> + else if (abs(temp - pixclock) < err) {
> + pr_debug("Entered the else if block %d\n", i);
> + err = abs(temp - pixclock);
> + bestval = pixval + i;
> + bestfreq = temp;
> + }
> + }
> +
> + pr_debug("DIU chose = %lx\n", bestval);
> + pr_debug("DIU error = %ld\n NomPixClk ", err);
> + pr_debug("DIU: Best Freq = %lx\n", bestfreq);
> + /* Modify DIU_DIV in CCM SCFR1 */
> + temp = in_be32(ccm + CCM_SCFR1);
> + pr_debug("DIU: Current value of SCFR1: 0x%08x\n", temp);
> + temp &= ~DIU_DIV_MASK;
> + temp |= (bestval & DIU_DIV_MASK);
> + out_be32(ccm + CCM_SCFR1, temp);
> + pr_debug("DIU: Modified value of SCFR1: 0x%08x\n", temp);
> + iounmap(ccm);
> +}
> +
> +ssize_t mpc512x_show_monitor_port(int monitor_port, char *buf)
> +{
> + return snprintf(buf, PAGE_SIZE, "0 - 5121 LCD\n");
> +}
> +
> +int mpc512x_set_sysfs_monitor_port(int val)
> +{
> + return 0;
> +}
> +
> +struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
> +EXPORT_SYMBOL_GPL(diu_shared_fb);
> +
> +#if defined(CONFIG_FB_FSL_DIU) || \
> + defined(CONFIG_FB_FSL_DIU_MODULE)
> +static inline void mpc512x_free_bootmem(struct page *page)
> +{
> + __ClearPageReserved(page);
> + BUG_ON(PageTail(page));
> + BUG_ON(atomic_read(&page->_count) > 1);
> + atomic_set(&page->_count, 1);
> + __free_page(page);
> + totalram_pages++;
> +}
> +
> +void mpc512x_release_bootmem(void)
> +{
> + unsigned long addr = diu_shared_fb.fb_phys & PAGE_MASK;
> + unsigned long size = diu_shared_fb.fb_len;
> + unsigned long start, end;
> +
> + if (diu_shared_fb.in_use) {
> + start = PFN_UP(addr);
> + end = PFN_DOWN(addr + size);
> +
> + for (; start < end; start++)
> + mpc512x_free_bootmem(pfn_to_page(start));
> +
> + diu_shared_fb.in_use = false;
> + }
> + diu_ops.release_bootmem = NULL;
> +}
> +#endif
> +
> +/*
> + * Check if DIU was pre-initialized. If so, perform steps
> + * needed to continue displaying through the whole boot process.
> + * Move area descriptor and gamma table elsewhere, they are
> + * destroyed by bootmem allocator otherwise. The frame buffer
> + * address range will be reserved in setup_arch() after bootmem
> + * allocator is up.
> + */
> +void __init mpc512x_init_diu(void)
> +{
> + struct device_node *np;
> + void __iomem *diu_reg;
> + phys_addr_t desc;
> + void __iomem *vaddr;
> + unsigned long mode, pix_fmt, res, bpp;
> + unsigned long dst;
> +
> + np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-diu");
> + if (!np) {
> + pr_err("No DIU node\n");
> + return;
> + }
> +
> + diu_reg = of_iomap(np, 0);
> + of_node_put(np);
> + if (!diu_reg) {
> + pr_err("Can't map DIU\n");
> + return;
> + }
> +
> + mode = in_be32(diu_reg + 0x1c);
> + if (mode != 1) {
> + pr_info("%s: DIU OFF\n", __func__);
> + goto out;
> + }
> +
> + desc = in_be32(diu_reg);
> + vaddr = ioremap(desc, sizeof(struct diu_ad));
> + if (!vaddr) {
> + pr_err("Can't map DIU area desc.\n");
> + goto out;
> + }
> + memcpy(&diu_shared_fb.ad0, vaddr, sizeof(struct diu_ad));
> + /* flush fb area descriptor */
> + dst = (unsigned long)&diu_shared_fb.ad0;
> + flush_dcache_range(dst, dst + sizeof(struct diu_ad) - 1);
> +
> + res = in_be32(diu_reg + 0x28);
> + pix_fmt = in_le32(vaddr);
> + bpp = ((pix_fmt >> 16) & 0x3) + 1;
> + diu_shared_fb.fb_phys = in_le32(vaddr + 4);
> + diu_shared_fb.fb_len = ((res & 0xfff0000) >> 16) * (res & 0xfff) * bpp;
> + diu_shared_fb.in_use = true;
> + iounmap(vaddr);
> +
> + desc = in_be32(diu_reg + 0xc);
> + vaddr = ioremap(desc, sizeof(diu_shared_fb.gamma));
> + if (!vaddr) {
> + pr_err("Can't map DIU area desc.\n");
> + diu_shared_fb.in_use = false;
> + goto out;
> + }
> + memcpy(&diu_shared_fb.gamma, vaddr, sizeof(diu_shared_fb.gamma));
> + /* flush gamma table */
> + dst = (unsigned long)&diu_shared_fb.gamma;
> + flush_dcache_range(dst, dst + sizeof(diu_shared_fb.gamma) - 1);
> +
> + iounmap(vaddr);
> + out_be32(diu_reg + 0xc, virt_to_phys(&diu_shared_fb.gamma));
> + out_be32(diu_reg + 4, 0);
> + out_be32(diu_reg + 8, 0);
> + out_be32(diu_reg, virt_to_phys(&diu_shared_fb.ad0));
> +
> +out:
> + iounmap(diu_reg);
> +}
> +
> +void __init mpc512x_setup_diu(void)
> +{
> + int ret;
> +
> + if (diu_shared_fb.in_use) {
> + ret = reserve_bootmem(diu_shared_fb.fb_phys,
> + diu_shared_fb.fb_len,
> + BOOTMEM_EXCLUSIVE);
> + if (ret) {
> + pr_err("%s: reserve bootmem failed\n", __func__);
> + diu_shared_fb.in_use = false;
> + }
> + }
> +
> +#if defined(CONFIG_FB_FSL_DIU) || \
> + defined(CONFIG_FB_FSL_DIU_MODULE)
> + diu_ops.get_pixel_format = mpc512x_get_pixel_format;
> + diu_ops.set_gamma_table = mpc512x_set_gamma_table;
> + diu_ops.set_monitor_port = mpc512x_set_monitor_port;
> + diu_ops.set_pixel_clock = mpc512x_set_pixel_clock;
> + diu_ops.show_monitor_port = mpc512x_show_monitor_port;
> + diu_ops.set_sysfs_monitor_port = mpc512x_set_sysfs_monitor_port;
> + diu_ops.release_bootmem = mpc512x_release_bootmem;
> +#endif
> +}
> +
> void __init mpc512x_init_IRQ(void)
> {
> struct device_node *np;
> diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
> index 19754be..346057d 100644
> --- a/arch/powerpc/sysdev/fsl_soc.h
> +++ b/arch/powerpc/sysdev/fsl_soc.h
> @@ -30,6 +30,7 @@ struct platform_diu_data_ops {
> void (*set_pixel_clock) (unsigned int pixclock);
> ssize_t (*show_monitor_port) (int monitor_port, char *buf);
> int (*set_sysfs_monitor_port) (int val);
> + void (*release_bootmem) (void);
> };
>
> extern struct platform_diu_data_ops diu_ops;
> diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
> index 19ca1da..263f7da 100644
> --- a/drivers/video/fsl-diu-fb.c
> +++ b/drivers/video/fsl-diu-fb.c
> @@ -34,7 +34,7 @@
> #include <linux/of_platform.h>
>
> #include <sysdev/fsl_soc.h>
> -#include "fsl-diu-fb.h"
> +#include <linux/fsl-diu-fb.h>
>
> #include "ofmode.h"
>
> @@ -331,8 +331,11 @@ static int fsl_diu_enable_panel(struct fb_info *info)
> if (mfbi->type != MFB_TYPE_OFF) {
> switch (mfbi->index) {
> case 0: /* plane 0 */
> - if (hw->desc[0] != ad->paddr)
> + if (in_be32(&hw->desc[0]) != ad->paddr) {
Unrelated bugfix? If so, please split into separate patch.
> + out_be32(&dr.diu_reg->diu_mode, 0);
> out_be32(&hw->desc[0], ad->paddr);
This line also looks like it needs fixing.
> + out_be32(&dr.diu_reg->diu_mode, 1);
> + }
> break;
> case 1: /* plane 1 AOI 0 */
> cmfbi = machine_data->fsl_diu_info[2]->par;
> @@ -391,7 +394,7 @@ static int fsl_diu_disable_panel(struct fb_info *info)
>
> switch (mfbi->index) {
> case 0: /* plane 0 */
> - if (hw->desc[0] != machine_data->dummy_ad->paddr)
> + if (in_be32(&hw->desc[0]) != machine_data->dummy_ad->paddr)
Same bugfix?
> out_be32(&hw->desc[0],
> machine_data->dummy_ad->paddr);
> break;
> @@ -1102,6 +1105,10 @@ static int fsl_diu_open(struct fb_info *info, int user)
> struct mfb_info *mfbi = info->par;
> int res = 0;
>
> + /* free boot splash memory on first /dev/fb0 open */
> + if (!mfbi->index && diu_ops.release_bootmem)
> + diu_ops.release_bootmem();
> +
> spin_lock(&diu_lock);
> mfbi->count++;
> if (mfbi->count = 1) {
> @@ -1436,6 +1443,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> int ret, i, error = 0;
> struct resource res;
> struct fsl_diu_data *machine_data;
> + int diu_mode;
>
> machine_data = kzalloc(sizeof(struct fsl_diu_data), GFP_KERNEL);
> if (!machine_data)
> @@ -1472,7 +1480,9 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> goto error2;
> }
>
> - out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU anyway*/
> + diu_mode = in_be32(&dr.diu_reg->diu_mode);
> + if (diu_mode != MFB_MODE1)
> + out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU */
Is this the best approach? Would it be better to make this decision
based on a property in the device tree?
>
> /* Get the IRQ of the DIU */
> machine_data->irq = irq_of_parse_and_map(np, 0);
> @@ -1520,7 +1530,12 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> machine_data->dummy_ad->offset_xyd = 0;
> machine_data->dummy_ad->next_ad = 0;
>
> - out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
> + /* Let DIU display splash screen if it was pre-initialized
> + * by the bootloader, set dummy area descriptor otherwise.
> + */
> + if (diu_mode != MFB_MODE1)
> + out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
> +
Same as above.
> out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr);
> out_be32(&dr.diu_reg->desc[2], machine_data->dummy_ad->paddr);
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode
2010-02-27 21:58 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT Anatolij Gustschin
@ 2010-02-28 6:52 ` Grant Likely
0 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2010-02-28 6:52 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fbdev, wd, dzu, jrigby, linuxppc-dev, yorksun
On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> Add support for specifying display panel data in the device
> tree. If no panel data is provided in the device tree, default
> video mode will be used as usual.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
This one seems okay, but the binding in the first patch first needs to
get resolved.
g.
> ---
> drivers/video/Kconfig | 1 +
> drivers/video/fsl-diu-fb.c | 63 +++++++++++++++++++++++++-------------------
> 2 files changed, 37 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index dc1beb0..c805ecd 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -1850,6 +1850,7 @@ config FB_FSL_DIU
> select FB_CFB_COPYAREA
> select FB_CFB_IMAGEBLIT
> select PPC_LIB_RHEAP
> + select FB_OF_MODE
> ---help---
> Framebuffer driver for the Freescale SoC DIU
>
> diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
> index 4637bcb..19ca1da 100644
> --- a/drivers/video/fsl-diu-fb.c
> +++ b/drivers/video/fsl-diu-fb.c
> @@ -36,6 +36,8 @@
> #include <sysdev/fsl_soc.h>
> #include "fsl-diu-fb.h"
>
> +#include "ofmode.h"
> +
> /*
> * These parameters give default parameters
> * for video output 1024x768,
> @@ -1168,7 +1170,7 @@ static int init_fbinfo(struct fb_info *info)
> return 0;
> }
>
> -static int __devinit install_fb(struct fb_info *info)
> +static int __devinit install_fb(struct device_node *np, struct fb_info *info)
> {
> int rc;
> struct mfb_info *mfbi = info->par;
> @@ -1177,33 +1179,40 @@ static int __devinit install_fb(struct fb_info *info)
> if (init_fbinfo(info))
> return -EINVAL;
>
> - if (mfbi->index = 0) /* plane 0 */
> - aoi_mode = fb_mode;
> - else
> + if (mfbi->index = 0) { /* plane 0 */
> + /* use default mode for plane0 if there is no mode in DTB */
> + if (of_get_video_mode(np, info) < 0)
> + aoi_mode = fb_mode;
> + else
> + aoi_mode = NULL;
> + } else
> aoi_mode = init_aoi_mode;
> - pr_debug("mode used = %s\n", aoi_mode);
> - rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
> - ARRAY_SIZE(fsl_diu_mode_db), &fsl_diu_default_mode, default_bpp);
>
> - switch (rc) {
> - case 1:
> - pr_debug("using mode specified in @mode\n");
> - break;
> - case 2:
> - pr_debug("using mode specified in @mode "
> - "with ignored refresh rate\n");
> - break;
> - case 3:
> - pr_debug("using mode default mode\n");
> - break;
> - case 4:
> - pr_debug("using mode from list\n");
> - break;
> - default:
> - pr_debug("rc = %d\n", rc);
> - pr_debug("failed to find mode\n");
> - return -EINVAL;
> - break;
> + if (aoi_mode) {
> + pr_debug("mode used = %s\n", aoi_mode);
> + rc = fb_find_mode(&info->var, info, aoi_mode, fsl_diu_mode_db,
> + ARRAY_SIZE(fsl_diu_mode_db),
> + &fsl_diu_default_mode, default_bpp);
> + switch (rc) {
> + case 1:
> + pr_debug("using mode specified in @mode\n");
> + break;
> + case 2:
> + pr_debug("using mode specified in @mode "
> + "with ignored refresh rate\n");
> + break;
> + case 3:
> + pr_debug("using mode default mode\n");
> + break;
> + case 4:
> + pr_debug("using mode from list\n");
> + break;
> + default:
> + pr_debug("rc = %d\n", rc);
> + pr_debug("failed to find mode\n");
> + return -EINVAL;
> + break;
> + }
> }
>
> pr_debug("xres_virtual %d\n", info->var.xres_virtual);
> @@ -1521,7 +1530,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> mfbi->ad = (struct diu_ad *)((u32)pool.ad.vaddr
> + pool.ad.offset) + i;
> mfbi->ad->paddr = pool.ad.paddr + i * sizeof(struct diu_ad);
> - ret = install_fb(machine_data->fsl_diu_info[i]);
> + ret = install_fb(np, machine_data->fsl_diu_info[i]);
> if (ret) {
> dev_err(&ofdev->dev,
> "Failed to register framebuffer %d\n",
> --
> 1.6.3.3
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34)
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
@ 2010-02-28 7:04 ` Grant Likely
2010-02-28 14:32 ` sun york-R58495
1 sibling, 0 replies; 15+ messages in thread
From: Grant Likely @ 2010-02-28 7:04 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fbdev, wd, dzu, jrigby, linuxppc-dev, yorksun
Hi Anatolij,
On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> This patch series rework DIU support patch submitted
> previously with the patch series for updating MPC5121
> support in mainline. It doesn't add new panel timing data
> to the framebuffer driver anymore. Instead we now allow
> encoding this data in the device tree. First two patches
> add this support.
Thanks for this work. I've made specific comments on the individual
patches. There are some details to be worked out, but I think it is
moving in the right direction.
> It is intended for inclusion in 2.6.34, since without
> DIU support patch framebuffer doesn't work on mpc5121.
It's actually late for 2.6.34. Unless it is a bug fix, I stop picking
up new patches somewhere in the -rc7 or -rc8 timerframe, and I am
definitely in bug-fix-only mode once the merge window has opened. I
do this to ensure all patches receive a decent amount of linux-next
exposure before I ask Linus to pull them.
I'll being picking up new patches for 2.6.35 into my -next branch
after 2.6.34-rc1 is released.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from device
[not found] ` <fa686aa41002272230s7f900c0fv1aabf0e26ccbf84c-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2010-02-28 8:44 ` Mitch Bradley
[not found] ` <4B8A2CD7.7070305-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>
0 siblings, 1 reply; 15+ messages in thread
From: Mitch Bradley @ 2010-02-28 8:44 UTC (permalink / raw)
To: Grant Likely
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, wd-ynQEQJNshbs,
dzu-ynQEQJNshbs, jrigby-Re5JQEeQqe8AvxtiuMwx3w,
devicetree-discuss, linuxppc-dev-mnsaURCQ41sdnm+yROfE0A,
yorksun-KZfg59tc24xl57MIdRCFDg
>
> Hi Anatolij,
>
> [added cc: to devicetree-discuss@lists.ozlabs.org]
>
> On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
>
>> > Framebuffer drivers may want to get panel timing info
>> > from the device tree. This patch adds appropriate support.
>> > Subsequent patch for FSL DIU frame buffer driver makes use
>> > of this functionality.
>>
>
> I think this is moving in the right direction, but there needs to
> debate & review over the binding before committing to anything.
> Please write a patch that documents the new binding in
> Documentation/powerpc/dts-bindings. All new bindings should be
> documented and reviewed on devicetree-discuss before merging any
> drivers that use them into mainline.
>
> From what I can tell by reading your code, I suspect that the binding
> you've designed will solve your immediate problem, but won't be able
> to handle anything slightly more complex, but it also looks like the
> binding has been designed to be generic, usable by any display device.
>
> First off, I did a tiny amount of research, and I didn't find any
> existing OpenFirmware bindings for describing video displays.
> Otherwise, I'd suggest considering that.
>
> From the little bit that I know, it seems that for most video devices
> (ie. PCs) the video card discovers the capabilities of the screen by
> reading the monitor's EDID data. However, in your particular case
> embedded case, a fixed flat panel is attached, and there isn't any
> EDID data provided. Therefore, you need an alternate method of
> describing the display capabilities. Rather than designing something
> entirely new, you may want to consider using the EDID data format
> directly; or at least cover the same things that EDID describes. The
> downside to using EDID directly is that it is a packed binary format
> that isn't parseable by mere mortals; but the data contained in it
> seems about right. The upside is the kernel already knows what to do
> with EDID data.
>
> Otherwise you risk designing something that won't be useful for
> anything much outside of your own use case. For example, the binding
> I see from the code cannot handle a display with multiple output
> modes.
>
> Also, since you're now in the realm of describing a video display,
> which is separate from the display controller, you should consider
> describing the display in a separate device tree node. Maybe
> something like this...
>
> video {
> compatible = "fsl,mpc5121-diu";
> display {
> compatible = "<vendor>,<model>";
> edid = [edid-data];
> };
> };
>
As it turns out, I'm doing exactly that - exporting verbatim EDID data
as the value of the "edid" property - for the display node on the Via
version of the OLPC machine. The kernel driver uses it instead of
trying to obtain the EDID data from the monitor, because the builtin
OLPC display cannot supply EDID data through the usual hardware interfaces.
Mitch
> Cheers,
> g.
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* RE: [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34)
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
2010-02-28 7:04 ` Grant Likely
@ 2010-02-28 14:32 ` sun york-R58495
1 sibling, 0 replies; 15+ messages in thread
From: sun york-R58495 @ 2010-02-28 14:32 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linux-fbdev, wd, dzu, jrigby, linuxppc-dev
I agree device tree is the right direction to go.
Sent from my Android phone
----- Original Message -----
From:"Anatolij Gustschin" <agust@denx.de>
To:"linuxppc-dev@ozlabs.org" <linuxppc-dev@ozlabs.org>
Cc:"grant.likely@secretlab.ca" <grant.likely@secretlab.ca>, "linux-fbdev@vger.kernel.org" <linux-fbdev@vger.kernel.org>, "yorksun@freescale.com" <yorksun@freescale.com>, "dzu@denx.de" <dzu@denx.de>, "wd@denx.de" <wd@denx.de>, "jrigby@gmail.com" <jrigby@gmail.com>, "Anatolij Gustschin" <agust@denx.de>
Sent:02-27-2010 16:00
Subject:[PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34)
This patch series rework DIU support patch submitted
previously with the patch series for updating MPC5121
support in mainline. It doesn't add new panel timing data
to the framebuffer driver anymore. Instead we now allow
encoding this data in the device tree. First two patches
add this support.
The third patch for DIU support is rebased, but still
depends on patches for adding MPC5121 USB support (because
it touches shared platform code).
It is intended for inclusion in 2.6.34, since without
DIU support patch framebuffer doesn't work on mpc5121.
Anatolij Gustschin (3):
video: add support for getting video mode from device tree
fbdev: fsl-diu-fb.c: allow setting panel video mode from DT
powerpc/mpc5121: shared DIU framebuffer support
arch/powerpc/platforms/512x/mpc5121_ads.c | 7 +
arch/powerpc/platforms/512x/mpc5121_generic.c | 13 ++
arch/powerpc/platforms/512x/mpc512x.h | 3 +
arch/powerpc/platforms/512x/mpc512x_shared.c | 282 +++++++++++++++++++++++++
arch/powerpc/sysdev/fsl_soc.h | 1 +
drivers/video/Kconfig | 6 +
drivers/video/Makefile | 1 +
drivers/video/fsl-diu-fb.c | 88 +++++---
drivers/video/fsl-diu-fb.h | 223 -------------------
drivers/video/ofmode.c | 95 +++++++++
drivers/video/ofmode.h | 6 +
include/linux/fsl-diu-fb.h | 223 +++++++++++++++++++
12 files changed, 693 insertions(+), 255 deletions(-)
delete mode 100644 drivers/video/fsl-diu-fb.h
create mode 100644 drivers/video/ofmode.c
create mode 100644 drivers/video/ofmode.h
create mode 100644 include/linux/fsl-diu-fb.h
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from device
[not found] ` <4B8A2CD7.7070305-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>
@ 2010-02-28 14:47 ` Grant Likely
2010-03-01 3:45 ` [PATCH 1/3] video: add support for getting video mode from Benjamin Herrenschmidt
1 sibling, 0 replies; 15+ messages in thread
From: Grant Likely @ 2010-02-28 14:47 UTC (permalink / raw)
To: Mitch Bradley
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, wd-ynQEQJNshbs,
dzu-ynQEQJNshbs, jrigby-Re5JQEeQqe8AvxtiuMwx3w,
devicetree-discuss, linuxppc-dev-mnsaURCQ41sdnm+yROfE0A,
yorksun-KZfg59tc24xl57MIdRCFDg
On Sun, Feb 28, 2010 at 1:44 AM, Mitch Bradley <wmb@firmworks.com> wrote:
> Grant Likely Wrote:
>> On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
>> Also, since you're now in the realm of describing a video display,
>> which is separate from the display controller, you should consider
>> describing the display in a separate device tree node. Maybe
>> something like this...
>>
>> video {
>> compatible = "fsl,mpc5121-diu";
>> display {
>> compatible = "<vendor>,<model>";
>> edid = [edid-data];
>> };
>> };
>>
>
>
> As it turns out, I'm doing exactly that - exporting verbatim EDID data as
> the value of the "edid" property - for the display node on the Via version
> of the OLPC machine. The kernel driver uses it instead of trying to obtain
> the EDID data from the monitor, because the builtin OLPC display cannot
> supply EDID data through the usual hardware interfaces.
Cool. That sounds sane then. How do you go about generating the EDID
data? Is there a tool that can do that? Or did you hand craft it?
Cheers,
g.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from
[not found] ` <4B8A2CD7.7070305-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>
2010-02-28 14:47 ` Grant Likely
@ 2010-03-01 3:45 ` Benjamin Herrenschmidt
2010-04-28 13:43 ` Anatolij Gustschin
1 sibling, 1 reply; 15+ messages in thread
From: Benjamin Herrenschmidt @ 2010-03-01 3:45 UTC (permalink / raw)
To: Mitch Bradley
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, wd-ynQEQJNshbs,
dzu-ynQEQJNshbs, jrigby-Re5JQEeQqe8AvxtiuMwx3w,
devicetree-discuss, linuxppc-dev-mnsaURCQ41sdnm+yROfE0A,
yorksun-KZfg59tc24xl57MIdRCFDg
At some stage, Grant wrote:
> > First off, I did a tiny amount of research, and I didn't find any
> > existing OpenFirmware bindings for describing video displays.
> > Otherwise, I'd suggest considering that.
There's a binding for framebuffers but it sucks big time :-) It doesn't
provide a reliable way for the OS to get to the physical address of the
fb, doesn't define outputs and mode setting, doesn't really deal with
>8bpp, etc....
On Sat, 2010-02-27 at 22:44 -1000, Mitch Bradley wrote:
> As it turns out, I'm doing exactly that - exporting verbatim EDID
> data
> as the value of the "edid" property - for the display node on the Via
> version of the OLPC machine. The kernel driver uses it instead of
> trying to obtain the EDID data from the monitor, because the builtin
> OLPC display cannot supply EDID data through the usual hardware
> interfaces.
This is actually a common practice (though EDID is most often in
uppercase) on Apple hardware too. It has issues though in the sense that
it doesn't carry proper connector information and falls over in many
multi-head cases.
I think passing the EDID data, when available, is thus the right thing
to do indeed, however that doesn't solve two problems:
- Where to put that property ? This is a complicated problem and we
might argue on a binding for weeks because video cards typically support
multiple outputs, etc. etc... I think the best for now is to stick as
closely as possible to the existing OF fb binding, and have "display"
nodes for each output, which can eventually contain an EDID. We might
also want to add a string that indicate the connector type. Specific
drivers might want to define additional properties here where it makes
sense such as binding of those outputs to CRTCs or such, up to you.
- We -also- want a way to specify the "default" mode as set by the
firmware, at least on some devices. The EDID gives capabilities, and
often for LCDs also the "preferred" mode which is almost always the
"default" mode ... but could be different. In order to avoid "flicking",
the driver might wants to know what is the currently programmed mode.
For that, having split out properties makes sense, though I would like
to either prefix them all with "mode," or stick them in a sub-node of
the display@.
Cheers,
Ben.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from
2010-03-01 3:45 ` [PATCH 1/3] video: add support for getting video mode from Benjamin Herrenschmidt
@ 2010-04-28 13:43 ` Anatolij Gustschin
2010-05-19 21:19 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
0 siblings, 1 reply; 15+ messages in thread
From: Anatolij Gustschin @ 2010-04-28 13:43 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, wd-ynQEQJNshbs,
dzu-ynQEQJNshbs, devicetree-discuss,
linuxppc-dev-mnsaURCQ41sdnm+yROfE0A,
yorksun-KZfg59tc24xl57MIdRCFDg
On Mon, 01 Mar 2010 14:45:20 +1100
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> On Sat, 2010-02-27 at 22:44 -1000, Mitch Bradley wrote:
>
> > As it turns out, I'm doing exactly that - exporting verbatim EDID
> > data
> > as the value of the "edid" property - for the display node on the Via
> > version of the OLPC machine. The kernel driver uses it instead of
> > trying to obtain the EDID data from the monitor, because the builtin
> > OLPC display cannot supply EDID data through the usual hardware
> > interfaces.
>
> This is actually a common practice (though EDID is most often in
> uppercase) on Apple hardware too. It has issues though in the sense that
> it doesn't carry proper connector information and falls over in many
> multi-head cases.
>
> I think passing the EDID data, when available, is thus the right thing
> to do indeed, however that doesn't solve two problems:
>
> - Where to put that property ? This is a complicated problem and we
> might argue on a binding for weeks because video cards typically support
> multiple outputs, etc. etc... I think the best for now is to stick as
> closely as possible to the existing OF fb binding, and have "display"
> nodes for each output, which can eventually contain an EDID. We might
> also want to add a string that indicate the connector type. Specific
> drivers might want to define additional properties here where it makes
> sense such as binding of those outputs to CRTCs or such, up to you.
Putting EDID to display node would be really sufficient for LCDs in
our case. Other systems might define this additional connector type
property.
>
> - We -also- want a way to specify the "default" mode as set by the
> firmware, at least on some devices. The EDID gives capabilities, and
> often for LCDs also the "preferred" mode which is almost always the
> "default" mode ... but could be different. In order to avoid "flicking",
> the driver might wants to know what is the currently programmed mode.
> For that, having split out properties makes sense, though I would like
> to either prefix them all with "mode," or stick them in a sub-node of
> the display@.
I would propose defining following properties in the case the
programmed mode is different from "default" mode:
display@...{
compatible = "<vendor>,<model>"
EDID = [edid-data];
current-mode {
pixel_clock = <value>;
horizontal_active = <value>;
horizontal_blank = <value>;
vertical_active = <value>;
vertical_blank = <value>;
horizontal_active = <value>;
hsync_offset = <value>;
hsync_pulse_width = <value>;
vsync_offset = <value>;
vsync_pulse_width = <value>;
hsync_positive;
vsync_positive;
}
};
The firmware can set the "default" mode using the EDID's preferred
Detailed Timing Descriptor data. If on some devices it sets another
mode than the preferred mode, then the firmware can insert a
"current-mode" sub-node with currently programmed mode. The driver
can check for this sub-node and use it's data and if it isn't present,
it can use the preferred timing data from EDID. The names of the
properties here are actually what Detailed Timing Descriptor in EDID
specifies. What do you think?
Thanks,
Anatolij
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support
2010-02-28 6:50 ` Grant Likely
@ 2010-04-28 20:28 ` Anatolij Gustschin
0 siblings, 0 replies; 15+ messages in thread
From: Anatolij Gustschin @ 2010-04-28 20:28 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev, linux-fbdev, yorksun, dzu, wd
Hi Grant,
Thanks for review and comments. I'm back to this now and hope
to address your comments soon.
On Sat, 27 Feb 2010 23:50:09 -0700
Grant Likely <grant.likely@secretlab.ca> wrote:
> On Sat, Feb 27, 2010 at 2:58 PM, Anatolij Gustschin <agust@denx.de> wrote:
> > MPC5121 DIU configuration/setup as initialized by the boot
> > loader currently will get lost while booting Linux. As a
> > result displaying the boot splash is not possible through
> > the boot process.
> >
> > To prevent this we reserve configured DIU frame buffer
> > address range while booting and preserve AOI descriptor
> > and gamma table so that DIU continues displaying through
> > the whole boot process. On first open from user space
> > DIU frame buffer driver releases the reserved frame
> > buffer area and continues to operate as usual.
> >
> > The patch also moves drivers/video/fsl-diu-fb.h file to
> > include/linux as we use some DIU structures in platform
> > code.
> >
> > 'diu_ops' callbacks in platform code borrowed from John's
> > DIU code.
> >
> > Signed-off-by: John Rigby <jrigby@gmail.com>
> > Signed-off-by: Anatolij Gustschin <agust@denx.de>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
>
> On quick glance this patch seems mostly okay, but this patch should
> probably be broken up a bit to simplify review and dissociate
> unrelated changes. For example, the move of fsl-diu-fb.h is a
> discrete change that should be split off. Some more comments
> below....
I will split off fsl-diu-fb.h move to separate patch.
...
> > diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
> > index a6c0e3a..3aaa281 100644
> > --- a/arch/powerpc/platforms/512x/mpc5121_generic.c
> > +++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
> > @@ -28,6 +28,7 @@
> > */
> > static char *board[] __initdata = {
> > "prt,prtlvt",
> > + "ifm,pdm360ng",
>
> You're adding a new board here. This is completely unrelated.
Yes, it is unrelated. This hunk sneaked in by accident, will drop it.
...
> > diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
> > index d72b2c7..1cfe9d5 100644
> > --- a/arch/powerpc/platforms/512x/mpc512x.h
> > +++ b/arch/powerpc/platforms/512x/mpc512x.h
> > @@ -17,4 +17,7 @@ extern int __init mpc5121_clk_init(void);
> > void __init mpc512x_declare_of_platform_devices(void);
> > extern void mpc512x_restart(char *cmd);
> > extern void __init mpc5121_usb_init(void);
> > +extern void __init mpc512x_init_diu(void);
> > +extern void __init mpc512x_setup_diu(void);
>
> __init annotations do not belong in header files.
Ok, I will remove them.
> > +extern struct fsl_diu_shared_fb diu_shared_fb;
>
> Hmmmm. I'm not fond of the global data structure. Especially
> considering that the struct fsl_diu_shared_fb is defined in
> mpc512x_shared.c, so nothing outside of that .c file can do anything
> with the structure.
This is a remainder from early debugging code, will remove it.
> > #endif /* __MPC512X_H__ */
> > diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
> > index fbdf65f..a8c50a6 100644
> > --- a/arch/powerpc/platforms/512x/mpc512x_shared.c
> > +++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
> > @@ -16,7 +16,11 @@
> > #include <linux/io.h>
> > #include <linux/irq.h>
> > #include <linux/of_platform.h>
> > +#include <linux/fsl-diu-fb.h>
> > +#include <linux/bootmem.h>
> > +#include <sysdev/fsl_soc.h>
> >
> > +#include <asm/cacheflush.h>
> > #include <asm/machdep.h>
> > #include <asm/ipic.h>
> > #include <asm/prom.h>
> > @@ -53,6 +57,284 @@ void mpc512x_restart(char *cmd)
> > ;
> > }
> >
> > +struct fsl_diu_shared_fb {
> > + char gamma[0x300]; /* 32-bit aligned! */
> > + struct diu_ad ad0; /* 32-bit aligned! */
> > + phys_addr_t fb_phys;
> > + size_t fb_len;
> > + bool in_use;
> > +};
> > +
> > +unsigned int mpc512x_get_pixel_format(unsigned int bits_per_pixel,
> > + int monitor_port)
> > +{
> > + unsigned int pix_fmt;
> > +
> > + switch (bits_per_pixel) {
> > + case 32:
> > + pix_fmt = 0x88883316;
> > + break;
> > + case 24:
> > + pix_fmt = 0x88082219;
> > + break;
> > + case 16:
> > + pix_fmt = 0x65053118;
> > + break;
> > + default:
> > + pix_fmt = 0x00000400;
> > + }
> > + return pix_fmt;
> > +}
> > +
> > +void mpc512x_set_gamma_table(int monitor_port, char *gamma_table_base)
> > +{
> > +}
> > +
> > +void mpc512x_set_monitor_port(int monitor_port)
> > +{
> > +}
> > +
> > +#define CCM_SCFR1 0x0000000c
> > +#define DIU_DIV_MASK 0x000000ff
> > +void mpc512x_set_pixel_clock(unsigned int pixclock)
> > +{
> > + unsigned long bestval, bestfreq, speed_ccb, busfreq;
> > + unsigned long minpixclock, maxpixclock, pixval;
> > + struct device_node *np;
> > + void __iomem *ccm;
> > + u32 temp;
> > + long err;
> > + int i;
> > +
> > + np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-clock");
> > + if (!np) {
> > + pr_err("Can't find clock control module.\n");
> > + return;
> > + }
> > +
> > + ccm = of_iomap(np, 0);
> > + if (!ccm) {
> > + pr_err("Can't map clock control module reg.\n");
> > + of_node_put(np);
> > + return;
> > + }
> > + of_node_put(np);
> > +
> > + busfreq = 200000000;
>
> Instead of some hard coding some bogus defalt busfreq, you should
> error out if the real frequency cannot be determined. Force users to
> supply a valid tree.
Ok, will fix.
...
> > +
> > + /* Calculate the pixel clock with the smallest error */
> > + /* calculate the following in steps to avoid overflow */
> > + pr_debug("DIU pixclock in ps - %d\n", pixclock);
> > + temp = 1;
> > + temp *= 1000000000;
> > + temp /= pixclock;
> > + temp *= 1000;
> > + pixclock = temp;
>
> Really? I think you can simplify this.
Yes, will do it in the next patch.
...
> > diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
> > index 19ca1da..263f7da 100644
> > --- a/drivers/video/fsl-diu-fb.c
> > +++ b/drivers/video/fsl-diu-fb.c
> > @@ -34,7 +34,7 @@
> > #include <linux/of_platform.h>
> >
> > #include <sysdev/fsl_soc.h>
> > -#include "fsl-diu-fb.h"
> > +#include <linux/fsl-diu-fb.h>
> >
> > #include "ofmode.h"
> >
> > @@ -331,8 +331,11 @@ static int fsl_diu_enable_panel(struct fb_info *info)
> > if (mfbi->type != MFB_TYPE_OFF) {
> > switch (mfbi->index) {
> > case 0: /* plane 0 */
> > - if (hw->desc[0] != ad->paddr)
> > + if (in_be32(&hw->desc[0]) != ad->paddr) {
>
> Unrelated bugfix? If so, please split into separate patch.
>
>
> > + out_be32(&dr.diu_reg->diu_mode, 0);
> > out_be32(&hw->desc[0], ad->paddr);
>
> This line also looks like it needs fixing.
Will re-check it an fix.
>
> > + out_be32(&dr.diu_reg->diu_mode, 1);
> > + }
> > break;
> > case 1: /* plane 1 AOI 0 */
> > cmfbi = machine_data->fsl_diu_info[2]->par;
> > @@ -391,7 +394,7 @@ static int fsl_diu_disable_panel(struct fb_info *info)
> >
> > switch (mfbi->index) {
> > case 0: /* plane 0 */
> > - if (hw->desc[0] != machine_data->dummy_ad->paddr)
> > + if (in_be32(&hw->desc[0]) != machine_data->dummy_ad->paddr)
>
> Same bugfix?
Will re-check it, too.
>
> > out_be32(&hw->desc[0],
> > machine_data->dummy_ad->paddr);
> > break;
> > @@ -1102,6 +1105,10 @@ static int fsl_diu_open(struct fb_info *info, int user)
> > struct mfb_info *mfbi = info->par;
> > int res = 0;
> >
> > + /* free boot splash memory on first /dev/fb0 open */
> > + if (!mfbi->index && diu_ops.release_bootmem)
> > + diu_ops.release_bootmem();
> > +
> > spin_lock(&diu_lock);
> > mfbi->count++;
> > if (mfbi->count = 1) {
> > @@ -1436,6 +1443,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> > int ret, i, error = 0;
> > struct resource res;
> > struct fsl_diu_data *machine_data;
> > + int diu_mode;
> >
> > machine_data = kzalloc(sizeof(struct fsl_diu_data), GFP_KERNEL);
> > if (!machine_data)
> > @@ -1472,7 +1480,9 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> > goto error2;
> > }
> >
> > - out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU anyway*/
> > + diu_mode = in_be32(&dr.diu_reg->diu_mode);
> > + if (diu_mode != MFB_MODE1)
> > + out_be32(&dr.diu_reg->diu_mode, 0); /* disable DIU */
>
> Is this the best approach? Would it be better to make this decision
> based on a property in the device tree?
I don't think it is worth it. The driver disables the DIU
regardless of it is enabled or not and enables it later
using a dummy descriptor. We just prevent this disabling
if the DIU is pre-initialized and already displaying.
> >
> > /* Get the IRQ of the DIU */
> > machine_data->irq = irq_of_parse_and_map(np, 0);
> > @@ -1520,7 +1530,12 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
> > machine_data->dummy_ad->offset_xyd = 0;
> > machine_data->dummy_ad->next_ad = 0;
> >
> > - out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
> > + /* Let DIU display splash screen if it was pre-initialized
> > + * by the bootloader, set dummy area descriptor otherwise.
> > + */
> > + if (diu_mode != MFB_MODE1)
> > + out_be32(&dr.diu_reg->desc[0], machine_data->dummy_ad->paddr);
> > +
>
> Same as above.
>
> > out_be32(&dr.diu_reg->desc[1], machine_data->dummy_ad->paddr);
> > out_be32(&dr.diu_reg->desc[2], machine_data->dummy_ad->paddr);
> >
>
>
>
Thanks,
Anatolij
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/3] video: add support for getting video mode from device
2010-04-28 13:43 ` Anatolij Gustschin
@ 2010-05-19 21:19 ` Grant Likely
0 siblings, 0 replies; 15+ messages in thread
From: Grant Likely @ 2010-05-19 21:19 UTC (permalink / raw)
To: Anatolij Gustschin
Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA, wd-ynQEQJNshbs,
dzu-ynQEQJNshbs, devicetree-discuss,
linuxppc-dev-mnsaURCQ41sdnm+yROfE0A,
yorksun-KZfg59tc24xl57MIdRCFDg
On Wed, Apr 28, 2010 at 7:43 AM, Anatolij Gustschin <agust@denx.de> wrote:
> On Mon, 01 Mar 2010 14:45:20 +1100
> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
>> On Sat, 2010-02-27 at 22:44 -1000, Mitch Bradley wrote:
>>
>> > As it turns out, I'm doing exactly that - exporting verbatim EDID
>> > data
>> > as the value of the "edid" property - for the display node on the Via
>> > version of the OLPC machine. The kernel driver uses it instead of
>> > trying to obtain the EDID data from the monitor, because the builtin
>> > OLPC display cannot supply EDID data through the usual hardware
>> > interfaces.
>>
>> This is actually a common practice (though EDID is most often in
>> uppercase) on Apple hardware too. It has issues though in the sense that
>> it doesn't carry proper connector information and falls over in many
>> multi-head cases.
>>
>> I think passing the EDID data, when available, is thus the right thing
>> to do indeed, however that doesn't solve two problems:
>>
>> - Where to put that property ? This is a complicated problem and we
>> might argue on a binding for weeks because video cards typically support
>> multiple outputs, etc. etc... I think the best for now is to stick as
>> closely as possible to the existing OF fb binding, and have "display"
>> nodes for each output, which can eventually contain an EDID. We might
>> also want to add a string that indicate the connector type. Specific
>> drivers might want to define additional properties here where it makes
>> sense such as binding of those outputs to CRTCs or such, up to you.
>
> Putting EDID to display node would be really sufficient for LCDs in
> our case. Other systems might define this additional connector type
> property.
>
>>
>> - We -also- want a way to specify the "default" mode as set by the
>> firmware, at least on some devices. The EDID gives capabilities, and
>> often for LCDs also the "preferred" mode which is almost always the
>> "default" mode ... but could be different. In order to avoid "flicking",
>> the driver might wants to know what is the currently programmed mode.
>> For that, having split out properties makes sense, though I would like
>> to either prefix them all with "mode," or stick them in a sub-node of
>> the display@.
>
> I would propose defining following properties in the case the
> programmed mode is different from "default" mode:
>
> display@...{
> compatible = "<vendor>,<model>"
> EDID = [edid-data];
>
> current-mode {
> pixel_clock = <value>;
> horizontal_active = <value>;
> horizontal_blank = <value>;
> vertical_active = <value>;
> vertical_blank = <value>;
> horizontal_active = <value>;
> hsync_offset = <value>;
> hsync_pulse_width = <value>;
> vsync_offset = <value>;
> vsync_pulse_width = <value>;
> hsync_positive;
> vsync_positive;
> }
> };
>
> The firmware can set the "default" mode using the EDID's preferred
> Detailed Timing Descriptor data. If on some devices it sets another
> mode than the preferred mode, then the firmware can insert a
> "current-mode" sub-node with currently programmed mode. The driver
> can check for this sub-node and use it's data and if it isn't present,
> it can use the preferred timing data from EDID. The names of the
> properties here are actually what Detailed Timing Descriptor in EDID
> specifies. What do you think?
If you really want to do that, then I think it is okay. I really
don't know enough about the problem space to say whether or not that
particular description is a good binding or not, but regardless it
should be a video-controller-specific binding. The name of the node
should probably be prefixed with "<manufacturer>," and it should be
documented along with the display controller's device tree binding.
If another controller wants/needs a different binding format (for the
current mode), then that is fine too (unless you can make a really
good argument that this current-mode binding is perfect and no other
layout should ever be required). :-)
Cheers,
g.
>
> Thanks,
> Anatolij
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2010-05-19 21:19 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <fa686aa41002161006l3b301febt94fe990df4bddfe9@mail.gmail.com>
2010-02-27 21:58 ` [PATCH 0/3] Rework MPC5121 DIU support (for 2.6.34) Anatolij Gustschin
2010-02-28 7:04 ` Grant Likely
2010-02-28 14:32 ` sun york-R58495
2010-02-27 21:58 ` [PATCH 1/3] video: add support for getting video mode from device tree Anatolij Gustschin
2010-02-28 6:30 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
[not found] ` <fa686aa41002272230s7f900c0fv1aabf0e26ccbf84c-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2010-02-28 8:44 ` Mitch Bradley
[not found] ` <4B8A2CD7.7070305-D5eQfiDGL7eakBO8gow8eQ@public.gmane.org>
2010-02-28 14:47 ` Grant Likely
2010-03-01 3:45 ` [PATCH 1/3] video: add support for getting video mode from Benjamin Herrenschmidt
2010-04-28 13:43 ` Anatolij Gustschin
2010-05-19 21:19 ` [PATCH 1/3] video: add support for getting video mode from device Grant Likely
2010-02-27 21:58 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode from DT Anatolij Gustschin
2010-02-28 6:52 ` [PATCH 2/3] fbdev: fsl-diu-fb.c: allow setting panel video mode Grant Likely
2010-02-27 21:58 ` [PATCH 3/3] powerpc/mpc5121: shared DIU framebuffer support Anatolij Gustschin
2010-02-28 6:50 ` Grant Likely
2010-04-28 20:28 ` Anatolij Gustschin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).