* [PATCH 00/15] OMAP DSS fixes
@ 2010-01-08 13:22 Tomi Valkeinen
2010-01-08 13:22 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and send_null Tomi Valkeinen
0 siblings, 1 reply; 23+ messages in thread
From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw)
To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen
Bunch of small fixes to OMAP DSS for review.
Tomi
Peter Huewe (1):
video/omap: add __init/__exit macros to
drivers/video/omap/lcd_htcherald.c
Tomi Valkeinen (12):
OMAP: DSS2: DSI: fix VC channels in send_short and send_null
OMAP: DSS2: DSI: print debug DCS cmd in hex
OMAP: DSS2: Collect interrupt statistics
OMAP: DSS2: Fix crash when panel doesn't define enable_te()
OMAP: DSS2: RFBI: convert to new kfifo API
OMAP: OMAPFB: fix clk_get for RFBI
OMAP: OMAPFB: add dummy release function for omapdss
MAINTAINERS: change omapfb maintainer
MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry
OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem()
OMAP: DSS2: Make check-delay-loops consistent
OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded
Vaibhav Hiremath (1):
OMAP: DSS2: Fix compile warning
Ville Syrjälä (1):
DSS2: Reject scaling settings when they cannot be supported
MAINTAINERS | 15 +---
drivers/video/omap/dispc.c | 18 +---
drivers/video/omap/lcd_htcherald.c | 4 +-
drivers/video/omap/omapfb.h | 2 +
drivers/video/omap/omapfb_main.c | 25 +++++
drivers/video/omap/rfbi.c | 4 +-
drivers/video/omap2/dss/Kconfig | 7 ++
drivers/video/omap2/dss/core.c | 10 ++
drivers/video/omap2/dss/dispc.c | 74 +++++++++++++-
drivers/video/omap2/dss/dsi.c | 160 +++++++++++++++++++++++++++---
drivers/video/omap2/dss/dss.c | 6 +-
drivers/video/omap2/dss/dss.h | 14 +++
drivers/video/omap2/dss/rfbi.c | 30 +++---
drivers/video/omap2/omapfb/omapfb-main.c | 6 +
14 files changed, 309 insertions(+), 66 deletions(-)
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and send_null 2010-01-08 13:22 [PATCH 00/15] OMAP DSS fixes Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 02/15] OMAP: DSS2: DSI: print debug DCS cmd in hex Tomi Valkeinen 2010-01-08 13:29 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short Aguirre, Sergio 0 siblings, 2 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen - dsi_vc_send_short() needs to use dest_per for the peripheral id - dsi_vc_send_null() was always using channel id 0 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/dsi.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 5936487..c37bc5b 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -1999,7 +1999,8 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc) return -EINVAL; } - data_id = data_type | channel << 6; + /* data_id = data_type | channel << 6; */ + data_id = data_type | dsi.vc[channel].dest_per << 6; r = (data_id << 0) | (data << 8) | (ecc << 24); @@ -2011,7 +2012,7 @@ static int dsi_vc_send_short(int channel, u8 data_type, u16 data, u8 ecc) int dsi_vc_send_null(int channel) { u8 nullpkg[] = {0, 0, 0, 0}; - return dsi_vc_send_long(0, DSI_DT_NULL_PACKET, nullpkg, 4, 0); + return dsi_vc_send_long(channel, DSI_DT_NULL_PACKET, nullpkg, 4, 0); } EXPORT_SYMBOL(dsi_vc_send_null); -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 02/15] OMAP: DSS2: DSI: print debug DCS cmd in hex 2010-01-08 13:22 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and send_null Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 03/15] OMAP: DSS2: Collect interrupt statistics Tomi Valkeinen 2010-01-08 13:29 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short Aguirre, Sergio 1 sibling, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/dsi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index c37bc5b..dda7b3f 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -2059,7 +2059,7 @@ int dsi_vc_dcs_read(int channel, u8 dcs_cmd, u8 *buf, int buflen) int r; if (dsi.debug_read) - DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %u)\n", channel, dcs_cmd); + DSSDBG("dsi_vc_dcs_read(ch%d, dcs_cmd %x)\n", channel, dcs_cmd); r = dsi_vc_send_short(channel, DSI_DT_DCS_READ, dcs_cmd, 0); if (r) -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 03/15] OMAP: DSS2: Collect interrupt statistics 2010-01-08 13:22 ` [PATCH 02/15] OMAP: DSS2: DSI: print debug DCS cmd in hex Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 04/15] OMAP: DSS2: Fix crash when panel doesn't define enable_te() Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Collect interrupt statistics, printable via debugfs: debugfs/omapdss/dispc_irq debugfs/omapdss/dsi_irq The counters are reset when printed. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/Kconfig | 7 ++ drivers/video/omap2/dss/core.c | 8 +++ drivers/video/omap2/dss/dispc.c | 67 +++++++++++++++++++++ drivers/video/omap2/dss/dsi.c | 125 +++++++++++++++++++++++++++++++++++++++ drivers/video/omap2/dss/dss.h | 14 ++++ 5 files changed, 221 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig index 71d8dec..c63ce76 100644 --- a/drivers/video/omap2/dss/Kconfig +++ b/drivers/video/omap2/dss/Kconfig @@ -25,6 +25,13 @@ config OMAP2_DSS_DEBUG_SUPPORT This enables debug messages. You need to enable printing with 'debug' module parameter. +config OMAP2_DSS_COLLECT_IRQ_STATS + bool "Collect DSS IRQ statistics" + depends on OMAP2_DSS_DEBUG_SUPPORT + default n + help + Collect DSS IRQ statistics, printable via debugfs + config OMAP2_DSS_RFBI bool "RFBI support" default n diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 29497a0..dbb0ce2 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -395,6 +395,14 @@ static int dss_initialize_debugfs(void) debugfs_create_file("clk", S_IRUGO, dss_debugfs_dir, &dss_debug_dump_clocks, &dss_debug_fops); + debugfs_create_file("dispc_irq", S_IRUGO, dss_debugfs_dir, + &dispc_dump_irqs, &dss_debug_fops); + +#ifdef CONFIG_OMAP2_DSS_DSI + debugfs_create_file("dsi_irq", S_IRUGO, dss_debugfs_dir, + &dsi_dump_irqs, &dss_debug_fops); +#endif + debugfs_create_file("dss", S_IRUGO, dss_debugfs_dir, &dss_dump_regs, &dss_debug_fops); debugfs_create_file("dispc", S_IRUGO, dss_debugfs_dir, diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 6dabf4b..e2e0f9a 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -148,6 +148,12 @@ static const struct dispc_reg dispc_reg_att[] = { DISPC_GFX_ATTRIBUTES, DISPC_VID_ATTRIBUTES(0), DISPC_VID_ATTRIBUTES(1) }; +struct dispc_irq_stats { + unsigned long last_reset; + unsigned irq_count; + unsigned irqs[32]; +}; + static struct { void __iomem *base; @@ -160,6 +166,11 @@ static struct { struct work_struct error_work; u32 ctx[DISPC_SZ_REGS / sizeof(u32)]; + +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spinlock_t irq_stats_lock; + struct dispc_irq_stats irq_stats; +#endif } dispc; static void _omap_dispc_set_irqs(void); @@ -2247,6 +2258,50 @@ void dispc_dump_clocks(struct seq_file *s) enable_clocks(0); } +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS +void dispc_dump_irqs(struct seq_file *s) +{ + unsigned long flags; + struct dispc_irq_stats stats; + + spin_lock_irqsave(&dispc.irq_stats_lock, flags); + + stats = dispc.irq_stats; + memset(&dispc.irq_stats, 0, sizeof(dispc.irq_stats)); + dispc.irq_stats.last_reset = jiffies; + + spin_unlock_irqrestore(&dispc.irq_stats_lock, flags); + + seq_printf(s, "period %u ms\n", + jiffies_to_msecs(jiffies - stats.last_reset)); + + seq_printf(s, "irqs %d\n", stats.irq_count); +#define PIS(x) \ + seq_printf(s, "%-20s %10d\n", #x, stats.irqs[ffs(DISPC_IRQ_##x)-1]); + + PIS(FRAMEDONE); + PIS(VSYNC); + PIS(EVSYNC_EVEN); + PIS(EVSYNC_ODD); + PIS(ACBIAS_COUNT_STAT); + PIS(PROG_LINE_NUM); + PIS(GFX_FIFO_UNDERFLOW); + PIS(GFX_END_WIN); + PIS(PAL_GAMMA_MASK); + PIS(OCP_ERR); + PIS(VID1_FIFO_UNDERFLOW); + PIS(VID1_END_WIN); + PIS(VID2_FIFO_UNDERFLOW); + PIS(VID2_END_WIN); + PIS(SYNC_LOST); + PIS(SYNC_LOST_DIGIT); + PIS(WAKEUP); +#undef PIS +} +#else +void dispc_dump_irqs(struct seq_file *s) { } +#endif + void dispc_dump_regs(struct seq_file *s) { #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dispc_read_reg(r)) @@ -2665,6 +2720,13 @@ void dispc_irq_handler(void) irqstatus = dispc_read_reg(DISPC_IRQSTATUS); +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spin_lock(&dispc.irq_stats_lock); + dispc.irq_stats.irq_count++; + dss_collect_irq_stats(irqstatus, dispc.irq_stats.irqs); + spin_unlock(&dispc.irq_stats_lock); +#endif + #ifdef DEBUG if (dss_debug) print_irq_status(irqstatus); @@ -3012,6 +3074,11 @@ int dispc_init(void) spin_lock_init(&dispc.irq_lock); +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spin_lock_init(&dispc.irq_stats_lock); + dispc.irq_stats.last_reset = jiffies; +#endif + INIT_WORK(&dispc.error_work, dispc_error_worker); dispc.base = ioremap(DISPC_BASE, DISPC_SZ_REGS); diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index dda7b3f..f3eaf12 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -204,6 +204,14 @@ struct dsi_update_region { struct omap_dss_device *device; }; +struct dsi_irq_stats { + unsigned long last_reset; + unsigned irq_count; + unsigned dsi_irqs[32]; + unsigned vc_irqs[4][32]; + unsigned cio_irqs[32]; +}; + static struct { void __iomem *base; @@ -258,6 +266,11 @@ static struct #endif int debug_read; int debug_write; + +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spinlock_t irq_stats_lock; + struct dsi_irq_stats irq_stats; +#endif } dsi; #ifdef DEBUG @@ -528,6 +541,12 @@ void dsi_irq_handler(void) irqstatus = dsi_read_reg(DSI_IRQSTATUS); +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spin_lock(&dsi.irq_stats_lock); + dsi.irq_stats.irq_count++; + dss_collect_irq_stats(irqstatus, dsi.irq_stats.dsi_irqs); +#endif + if (irqstatus & DSI_IRQ_ERROR_MASK) { DSSERR("DSI error, irqstatus %x\n", irqstatus); print_irq_status(irqstatus); @@ -549,6 +568,10 @@ void dsi_irq_handler(void) vcstatus = dsi_read_reg(DSI_VC_IRQSTATUS(i)); +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + dss_collect_irq_stats(vcstatus, dsi.irq_stats.vc_irqs[i]); +#endif + if (vcstatus & DSI_VC_IRQ_BTA) complete(&dsi.bta_completion); @@ -568,6 +591,10 @@ void dsi_irq_handler(void) if (irqstatus & DSI_IRQ_COMPLEXIO_ERR) { ciostatus = dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS); +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + dss_collect_irq_stats(ciostatus, dsi.irq_stats.cio_irqs); +#endif + dsi_write_reg(DSI_COMPLEXIO_IRQ_STATUS, ciostatus); /* flush posted write */ dsi_read_reg(DSI_COMPLEXIO_IRQ_STATUS); @@ -579,6 +606,10 @@ void dsi_irq_handler(void) dsi_write_reg(DSI_IRQSTATUS, irqstatus & ~DSI_IRQ_CHANNEL_MASK); /* flush posted write */ dsi_read_reg(DSI_IRQSTATUS); + +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spin_unlock(&dsi.irq_stats_lock); +#endif } @@ -1226,6 +1257,95 @@ void dsi_dump_clocks(struct seq_file *s) enable_clocks(0); } +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS +void dsi_dump_irqs(struct seq_file *s) +{ + unsigned long flags; + struct dsi_irq_stats stats; + + spin_lock_irqsave(&dsi.irq_stats_lock, flags); + + stats = dsi.irq_stats; + memset(&dsi.irq_stats, 0, sizeof(dsi.irq_stats)); + dsi.irq_stats.last_reset = jiffies; + + spin_unlock_irqrestore(&dsi.irq_stats_lock, flags); + + seq_printf(s, "period %u ms\n", + jiffies_to_msecs(jiffies - stats.last_reset)); + + seq_printf(s, "irqs %d\n", stats.irq_count); +#define PIS(x) \ + seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]); + + seq_printf(s, "-- DSI interrupts --\n"); + PIS(VC0); + PIS(VC1); + PIS(VC2); + PIS(VC3); + PIS(WAKEUP); + PIS(RESYNC); + PIS(PLL_LOCK); + PIS(PLL_UNLOCK); + PIS(PLL_RECALL); + PIS(COMPLEXIO_ERR); + PIS(HS_TX_TIMEOUT); + PIS(LP_RX_TIMEOUT); + PIS(TE_TRIGGER); + PIS(ACK_TRIGGER); + PIS(SYNC_LOST); + PIS(LDO_POWER_GOOD); + PIS(TA_TIMEOUT); +#undef PIS + +#define PIS(x) \ + seq_printf(s, "%-20s %10d %10d %10d %10d\n", #x, \ + stats.vc_irqs[0][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[1][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[2][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[3][ffs(DSI_VC_IRQ_##x)-1]); + + seq_printf(s, "-- VC interrupts --\n"); + PIS(CS); + PIS(ECC_CORR); + PIS(PACKET_SENT); + PIS(FIFO_TX_OVF); + PIS(FIFO_RX_OVF); + PIS(BTA); + PIS(ECC_NO_CORR); + PIS(FIFO_TX_UDF); + PIS(PP_BUSY_CHANGE); +#undef PIS + +#define PIS(x) \ + seq_printf(s, "%-20s %10d\n", #x, \ + stats.cio_irqs[ffs(DSI_CIO_IRQ_##x)-1]); + + seq_printf(s, "-- CIO interrupts --\n"); + PIS(ERRSYNCESC1); + PIS(ERRSYNCESC2); + PIS(ERRSYNCESC3); + PIS(ERRESC1); + PIS(ERRESC2); + PIS(ERRESC3); + PIS(ERRCONTROL1); + PIS(ERRCONTROL2); + PIS(ERRCONTROL3); + PIS(STATEULPS1); + PIS(STATEULPS2); + PIS(STATEULPS3); + PIS(ERRCONTENTIONLP0_1); + PIS(ERRCONTENTIONLP1_1); + PIS(ERRCONTENTIONLP0_2); + PIS(ERRCONTENTIONLP1_2); + PIS(ERRCONTENTIONLP0_3); + PIS(ERRCONTENTIONLP1_3); + PIS(ULPSACTIVENOT_ALL0); + PIS(ULPSACTIVENOT_ALL1); +#undef PIS +} +#endif + void dsi_dump_regs(struct seq_file *s) { #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dsi_read_reg(r)) @@ -3638,6 +3758,11 @@ int dsi_init(struct platform_device *pdev) spin_lock_init(&dsi.errors_lock); dsi.errors = 0; +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS + spin_lock_init(&dsi.irq_stats_lock); + dsi.irq_stats.last_reset = jiffies; +#endif + init_completion(&dsi.bta_completion); init_completion(&dsi.update_completion); diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 8da5ac4..2bcb124 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h @@ -240,6 +240,7 @@ int dsi_init(struct platform_device *pdev); void dsi_exit(void); void dsi_dump_clocks(struct seq_file *s); +void dsi_dump_irqs(struct seq_file *s); void dsi_dump_regs(struct seq_file *s); void dsi_save_context(void); @@ -268,6 +269,7 @@ int dpi_init_display(struct omap_dss_device *dssdev); int dispc_init(void); void dispc_exit(void); void dispc_dump_clocks(struct seq_file *s); +void dispc_dump_irqs(struct seq_file *s); void dispc_dump_regs(struct seq_file *s); void dispc_irq_handler(void); void dispc_fake_vsync_irq(void); @@ -367,4 +369,16 @@ void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t); unsigned long rfbi_get_max_tx_rate(void); int rfbi_init_display(struct omap_dss_device *display); + +#ifdef CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS +static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr) +{ + int b; + for (b = 0; b < 32; ++b) { + if (irqstatus & (1 << b)) + irq_arr[b]++; + } +} +#endif + #endif -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 04/15] OMAP: DSS2: Fix crash when panel doesn't define enable_te() 2010-01-08 13:22 ` [PATCH 03/15] OMAP: DSS2: Collect interrupt statistics Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen DSI driver didn't check if the panel driver actually implements enable_te(). Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/dsi.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index f3eaf12..2881d93 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -2933,11 +2933,15 @@ static int dsi_set_update_mode(struct omap_dss_device *dssdev, static int dsi_set_te(struct omap_dss_device *dssdev, bool enable) { - int r; - r = dssdev->driver->enable_te(dssdev, enable); - /* XXX for some reason, DSI TE breaks if we don't wait here. - * Panel bug? Needs more studying */ - msleep(100); + int r = 0; + + if (dssdev->driver->enable_te) { + r = dssdev->driver->enable_te(dssdev, enable); + /* XXX for some reason, DSI TE breaks if we don't wait here. + * Panel bug? Needs more studying */ + msleep(100); + } + return r; } -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API 2010-01-08 13:22 ` [PATCH 04/15] OMAP: DSS2: Fix crash when panel doesn't define enable_te() Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 06/15] OMAP: OMAPFB: fix clk_get for RFBI Tomi Valkeinen 2010-01-08 16:52 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tony Lindgren 0 siblings, 2 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Compiles, but not tested. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/rfbi.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c index d0b3006..b936495 100644 --- a/drivers/video/omap2/dss/rfbi.c +++ b/drivers/video/omap2/dss/rfbi.c @@ -120,7 +120,7 @@ static struct { struct omap_dss_device *dssdev[2]; - struct kfifo *cmd_fifo; + struct kfifo cmd_fifo; spinlock_t cmd_lock; struct completion cmd_done; atomic_t cmd_fifo_full; @@ -1011,20 +1011,20 @@ static void process_cmd_fifo(void) return; while (true) { - spin_lock_irqsave(rfbi.cmd_fifo->lock, flags); + spin_lock_irqsave(&rfbi.cmd_lock, flags); - len = __kfifo_get(rfbi.cmd_fifo, (unsigned char *)&p, + len = kfifo_out(&rfbi.cmd_fifo, (unsigned char *)&p, sizeof(struct update_param)); if (len = 0) { DSSDBG("nothing more in fifo\n"); atomic_set(&rfbi.cmd_pending, 0); - spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags); + spin_unlock_irqrestore(&rfbi.cmd_lock, flags); break; } /* DSSDBG("fifo full %d\n", rfbi.cmd_fifo_full.counter);*/ - spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags); + spin_unlock_irqrestore(&rfbi.cmd_lock, flags); BUG_ON(len != sizeof(struct update_param)); BUG_ON(p.rfbi_module > 1); @@ -1052,25 +1052,25 @@ static void rfbi_push_cmd(struct update_param *p) unsigned long flags; int available; - spin_lock_irqsave(rfbi.cmd_fifo->lock, flags); + spin_lock_irqsave(&rfbi.cmd_lock, flags); available = RFBI_CMD_FIFO_LEN_BYTES - - __kfifo_len(rfbi.cmd_fifo); + kfifo_len(&rfbi.cmd_fifo); /* DSSDBG("%d bytes left in fifo\n", available); */ if (available < sizeof(struct update_param)) { DSSDBG("Going to wait because FIFO FULL..\n"); - spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags); + spin_unlock_irqrestore(&rfbi.cmd_lock, flags); atomic_inc(&rfbi.cmd_fifo_full); wait_for_completion(&rfbi.cmd_done); /*DSSDBG("Woke up because fifo not full anymore\n");*/ continue; } - ret = __kfifo_put(rfbi.cmd_fifo, (unsigned char *)p, + ret = kfifo_in(&rfbi.cmd_fifo, (unsigned char *)p, sizeof(struct update_param)); /* DSSDBG("pushed %d bytes\n", ret);*/ - spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags); + spin_unlock_irqrestore(&rfbi.cmd_lock, flags); BUG_ON(ret != sizeof(struct update_param)); @@ -1155,12 +1155,12 @@ int rfbi_init(void) { u32 rev; u32 l; + int r; spin_lock_init(&rfbi.cmd_lock); - rfbi.cmd_fifo = kfifo_alloc(RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL, - &rfbi.cmd_lock); - if (IS_ERR(rfbi.cmd_fifo)) - return -ENOMEM; + r = kfifo_alloc(&rfbi.cmd_fifo, RFBI_CMD_FIFO_LEN_BYTES, GFP_KERNEL); + if (r) + return r; init_completion(&rfbi.cmd_done); atomic_set(&rfbi.cmd_fifo_full, 0); @@ -1196,7 +1196,7 @@ void rfbi_exit(void) { DSSDBG("rfbi_exit\n"); - kfifo_free(rfbi.cmd_fifo); + kfifo_free(&rfbi.cmd_fifo); iounmap(rfbi.base); } -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 06/15] OMAP: OMAPFB: fix clk_get for RFBI 2010-01-08 13:22 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 07/15] OMAP: OMAPFB: add dummy release function for omapdss Tomi Valkeinen 2010-01-08 16:52 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tony Lindgren 1 sibling, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen omapfb platform device was still used to get clocks inside rfbi.c Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Tested-by: Sergey Lapin <slapin@ossfans.org> --- drivers/video/omap/dispc.c | 18 +++--------------- drivers/video/omap/omapfb.h | 2 ++ drivers/video/omap/omapfb_main.c | 18 ++++++++++++++++++ drivers/video/omap/rfbi.c | 4 ++-- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index c7c6455..e192b05 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -189,11 +189,6 @@ static struct { struct omapfb_color_key color_key; } dispc; -static struct platform_device omapdss_device = { - .name = "omapdss", - .id = -1, -}; - static void enable_lcd_clocks(int enable); static void inline dispc_write_reg(int idx, u32 val) @@ -920,20 +915,20 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) static int get_dss_clocks(void) { - dispc.dss_ick = clk_get(&omapdss_device.dev, "ick"); + dispc.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); if (IS_ERR(dispc.dss_ick)) { dev_err(dispc.fbdev->dev, "can't get ick\n"); return PTR_ERR(dispc.dss_ick); } - dispc.dss1_fck = clk_get(&omapdss_device.dev, "dss1_fck"); + dispc.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); if (IS_ERR(dispc.dss1_fck)) { dev_err(dispc.fbdev->dev, "can't get dss1_fck\n"); clk_put(dispc.dss_ick); return PTR_ERR(dispc.dss1_fck); } - dispc.dss_54m_fck = clk_get(&omapdss_device.dev, "tv_fck"); + dispc.dss_54m_fck = clk_get(&dispc.fbdev->dssdev->dev, "tv_fck"); if (IS_ERR(dispc.dss_54m_fck)) { dev_err(dispc.fbdev->dev, "can't get tv_fck\n"); clk_put(dispc.dss_ick); @@ -1385,12 +1380,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, int skip_init = 0; int i; - r = platform_device_register(&omapdss_device); - if (r) { - dev_err(fbdev->dev, "can't register omapdss device\n"); - return r; - } - memset(&dispc, 0, sizeof(dispc)); dispc.base = ioremap(DISPC_BASE, SZ_1K); @@ -1534,7 +1523,6 @@ static void omap_dispc_cleanup(void) free_irq(INT_24XX_DSS_IRQ, dispc.fbdev); put_dss_clocks(); iounmap(dispc.base); - platform_device_unregister(&omapdss_device); } const struct lcd_ctrl omap2_int_ctrl = { diff --git a/drivers/video/omap/omapfb.h b/drivers/video/omap/omapfb.h index 46e4714..af3c9e5 100644 --- a/drivers/video/omap/omapfb.h +++ b/drivers/video/omap/omapfb.h @@ -203,6 +203,8 @@ struct omapfb_device { struct omapfb_mem_desc mem_desc; struct fb_info *fb_info[OMAPFB_PLANE_NUM]; + + struct platform_device *dssdev; /* dummy dev for clocks */ }; #ifdef CONFIG_ARCH_OMAP1 diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index c7f59a5..f74aec9 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -83,6 +83,12 @@ static struct caps_table_struct color_caps[] = { { 1 << OMAPFB_COLOR_YUY422, "YUY422", }, }; +/* dummy device for clocks */ +static struct platform_device omapdss_device = { + .name = "omapdss", + .id = -1, +}; + /* * --------------------------------------------------------------------------- * LCD panel @@ -1700,6 +1706,7 @@ static int omapfb_do_probe(struct platform_device *pdev, fbdev->dev = &pdev->dev; fbdev->panel = panel; + fbdev->dssdev = &omapdss_device; platform_set_drvdata(pdev, fbdev); mutex_init(&fbdev->rqueue_mutex); @@ -1814,8 +1821,16 @@ cleanup: static int omapfb_probe(struct platform_device *pdev) { + int r; + BUG_ON(fbdev_pdev != NULL); + r = platform_device_register(&omapdss_device); + if (r) { + dev_err(&pdev->dev, "can't register omapdss device\n"); + return r; + } + /* Delay actual initialization until the LCD is registered */ fbdev_pdev = pdev; if (fbdev_panel != NULL) @@ -1843,6 +1858,9 @@ static int omapfb_remove(struct platform_device *pdev) fbdev->state = OMAPFB_DISABLED; omapfb_free_resources(fbdev, saved_state); + platform_device_unregister(&omapdss_device); + fbdev->dssdev = NULL; + return 0; } diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c index fed7b1b..1162603 100644 --- a/drivers/video/omap/rfbi.c +++ b/drivers/video/omap/rfbi.c @@ -83,13 +83,13 @@ static inline u32 rfbi_read_reg(int idx) static int rfbi_get_clocks(void) { - rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "ick"); + rfbi.dss_ick = clk_get(&dispc.fbdev->dssdev->dev, "ick"); if (IS_ERR(rfbi.dss_ick)) { dev_err(rfbi.fbdev->dev, "can't get ick\n"); return PTR_ERR(rfbi.dss_ick); } - rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck"); + rfbi.dss1_fck = clk_get(&dispc.fbdev->dssdev->dev, "dss1_fck"); if (IS_ERR(rfbi.dss1_fck)) { dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n"); clk_put(rfbi.dss_ick); -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 07/15] OMAP: OMAPFB: add dummy release function for omapdss 2010-01-08 13:22 ` [PATCH 06/15] OMAP: OMAPFB: fix clk_get for RFBI Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 08/15] MAINTAINERS: change omapfb maintainer Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen This should fix: WARNING: at drivers/base/core.c:131 device_release+0x68/0x7c() Device 'omapdss' does not have a release() function, it is broken and must be fixed. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap/omapfb_main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index f74aec9..2c4f470 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -83,10 +83,17 @@ static struct caps_table_struct color_caps[] = { { 1 << OMAPFB_COLOR_YUY422, "YUY422", }, }; +static void omapdss_release(struct device *dev) +{ +} + /* dummy device for clocks */ static struct platform_device omapdss_device = { .name = "omapdss", .id = -1, + .dev = { + .release = omapdss_release, + }, }; /* -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 08/15] MAINTAINERS: change omapfb maintainer 2010-01-08 13:22 ` [PATCH 07/15] OMAP: OMAPFB: add dummy release function for omapdss Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Acked-by: Imre Deak <imre.deak@nokia.com> --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 66f5f7d..8d2fcee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3949,7 +3949,7 @@ S: Maintained F: sound/soc/omap/ OMAP FRAMEBUFFER SUPPORT -M: Imre Deak <imre.deak@nokia.com> +M: Tomi Valkeinen <tomi.valkeinen@nokia.com> L: linux-fbdev@vger.kernel.org L: linux-omap@vger.kernel.org S: Maintained -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry 2010-01-08 13:22 ` [PATCH 08/15] MAINTAINERS: change omapfb maintainer Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 10/15] OMAP: DSS2: Fix compile warning Tomi Valkeinen 2010-01-11 11:46 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one Grazvydas Ignotas 0 siblings, 2 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen There isn't really any reason to divide those. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- MAINTAINERS | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8d2fcee..d370787 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3955,23 +3955,14 @@ L: linux-omap@vger.kernel.org S: Maintained F: drivers/video/omap/ -OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2) +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) M: Tomi Valkeinen <tomi.valkeinen@nokia.com> L: linux-omap@vger.kernel.org L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) S: Maintained -F: drivers/video/omap2/dss/ -F: drivers/video/omap2/vrfb.c -F: drivers/video/omap2/vram.c +F: drivers/video/omap2/ F: Documentation/arm/OMAP/DSS -OMAP FRAMEBUFFER SUPPORT (FOR DSS2) -M: Tomi Valkeinen <tomi.valkeinen@nokia.com> -L: linux-omap@vger.kernel.org -L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) -S: Maintained -F: drivers/video/omap2/omapfb/ - OMAP MMC SUPPORT M: Jarkko Lavinen <jarkko.lavinen@nokia.com> L: linux-omap@vger.kernel.org -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 10/15] OMAP: DSS2: Fix compile warning 2010-01-08 13:22 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 11/15] video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c Tomi Valkeinen 2010-01-11 11:46 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one Grazvydas Ignotas 1 sibling, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Vaibhav Hiremath From: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/dss/core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index dbb0ce2..82918ee 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -124,6 +124,7 @@ static void restore_all_ctx(void) dss_clk_disable_all_no_ctx(); } +#if defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) /* CLOCKS */ static void core_dump_clocks(struct seq_file *s) { @@ -149,6 +150,7 @@ static void core_dump_clocks(struct seq_file *s) clocks[i]->usecount); } } +#endif /* defined(CONFIG_DEBUG_FS) && defined(CONFIG_OMAP2_DSS_DEBUG_SUPPORT) */ static int dss_get_clock(struct clk **clock, const char *clk_name) { -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 11/15] video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c 2010-01-08 13:22 ` [PATCH 10/15] OMAP: DSS2: Fix compile warning Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 12/15] OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem() Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Peter Huewe From: Peter Huewe <peterhuewe@gmx.de> Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/video/omap/lcd_htcherald.c Please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree. Patch against linux-next-tree, 22. Dez 08:38:18 CET 2009 but also present in linus tree. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Acked-by: Tony Lindgren <tony@atomide.com> --- drivers/video/omap/lcd_htcherald.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap/lcd_htcherald.c b/drivers/video/omap/lcd_htcherald.c index a9007c5..4802419 100644 --- a/drivers/video/omap/lcd_htcherald.c +++ b/drivers/video/omap/lcd_htcherald.c @@ -115,12 +115,12 @@ struct platform_driver htcherald_panel_driver = { }, }; -static int htcherald_panel_drv_init(void) +static int __init htcherald_panel_drv_init(void) { return platform_driver_register(&htcherald_panel_driver); } -static void htcherald_panel_drv_cleanup(void) +static void __exit htcherald_panel_drv_cleanup(void) { platform_driver_unregister(&htcherald_panel_driver); } -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 12/15] OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem() 2010-01-08 13:22 ` [PATCH 11/15] video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 13/15] OMAP: DSS2: Make check-delay-loops consistent Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Fixes bug causing VRFB memory area to be released twice. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Reported-by: Eino-Ville Talvala <talvala@stanford.edu> --- drivers/video/omap2/omapfb/omapfb-main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index ef29983..e61a75c 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -1311,6 +1311,7 @@ static void omapfb_free_fbmem(struct fb_info *fbi) if (rg->vrfb.vaddr[0]) { iounmap(rg->vrfb.vaddr[0]); omap_vrfb_release_ctx(&rg->vrfb); + rg->vrfb.vaddr[0] = NULL; } } -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 13/15] OMAP: DSS2: Make check-delay-loops consistent 2010-01-08 13:22 ` [PATCH 12/15] OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem() Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 14/15] DSS2: Reject scaling settings when they cannot be supported Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen Loops checking for certain condition were rather inconsistent. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> Reported-by: Juha Leppanen <juha_motorsportcom@luukku.com> --- drivers/video/omap2/dss/dsi.c | 14 +++++++------- drivers/video/omap2/dss/dss.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 2881d93..d964869 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -828,12 +828,12 @@ static int dsi_pll_power(enum dsi_pll_power_state state) /* PLL_PWR_STATUS */ while (FLD_GET(dsi_read_reg(DSI_CLK_CTRL), 29, 28) != state) { - udelay(1); - if (t++ > 1000) { + if (++t > 1000) { DSSERR("Failed to set DSI PLL power mode to %d\n", state); return -ENODEV; } + udelay(1); } return 0; @@ -1441,12 +1441,12 @@ static int dsi_complexio_power(enum dsi_complexio_power_state state) /* PWR_STATUS */ while (FLD_GET(dsi_read_reg(DSI_COMPLEXIO_CFG1), 26, 25) != state) { - udelay(1); - if (t++ > 1000) { + if (++t > 1000) { DSSERR("failed to set complexio power state to " "%d\n", state); return -ENODEV; } + udelay(1); } return 0; @@ -1646,10 +1646,10 @@ static void dsi_complexio_uninit(void) static int _dsi_wait_reset(void) { - int i = 0; + int t = 0; while (REG_GET(DSI_SYSSTATUS, 0, 0) = 0) { - if (i++ > 5) { + if (++t > 5) { DSSERR("soft reset failed\n"); return -ENODEV; } @@ -2707,7 +2707,6 @@ static int dsi_update_screen_l4(struct omap_dss_device *dssdev, /* using fifo not empty */ /* TX_FIFO_NOT_EMPTY */ while (FLD_GET(dsi_read_reg(DSI_VC_CTRL(0)), 5, 5)) { - udelay(1); fifo_stalls++; if (fifo_stalls > 0xfffff) { DSSERR("fifo stalls overflow, pixels left %d\n", @@ -2715,6 +2714,7 @@ static int dsi_update_screen_l4(struct omap_dss_device *dssdev, dsi_if_enable(0); return -EIO; } + udelay(1); } #elif 1 /* using fifo emptiness */ diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c index 9b05ee6..0a26b7d 100644 --- a/drivers/video/omap2/dss/dss.c +++ b/drivers/video/omap2/dss/dss.c @@ -467,14 +467,14 @@ static irqreturn_t dss_irq_handler_omap3(int irq, void *arg) static int _omap_dss_wait_reset(void) { - unsigned timeout = 1000; + int t = 0; while (REG_GET(DSS_SYSSTATUS, 0, 0) = 0) { - udelay(1); - if (!--timeout) { + if (++t > 1000) { DSSERR("soft reset failed\n"); return -ENODEV; } + udelay(1); } return 0; -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 14/15] DSS2: Reject scaling settings when they cannot be supported 2010-01-08 13:22 ` [PATCH 13/15] OMAP: DSS2: Make check-delay-loops consistent Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 15/15] OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Ville Syrjälä From: Ville Syrj채l채 <ville.syrjala@nokia.com> If the scaling ratio is below 0.5 video output width can't be identical to the display width. Reject such settings. Signed-off-by: Ville Syrj채l채 <ville.syrjala@nokia.com> --- drivers/video/omap2/dss/dispc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index e2e0f9a..de8bfba 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -1454,7 +1454,10 @@ static unsigned long calc_fclk_five_taps(u16 width, u16 height, do_div(tmp, 2 * out_height * ppl); fclk = tmp; - if (height > 2 * out_height && ppl != out_width) { + if (height > 2 * out_height) { + if (ppl = out_width) + return 0; + tmp = pclk * (height - 2 * out_height) * out_width; do_div(tmp, 2 * out_height * (ppl - out_width)); fclk = max(fclk, (u32) tmp); @@ -1634,7 +1637,7 @@ static int _dispc_setup_plane(enum omap_plane plane, DSSDBG("required fclk rate = %lu Hz\n", fclk); DSSDBG("current fclk rate = %lu Hz\n", dispc_fclk_rate()); - if (fclk > dispc_fclk_rate()) { + if (!fclk || fclk > dispc_fclk_rate()) { DSSERR("failed to set up scaling, " "required fclk rate = %lu Hz, " "current fclk rate = %lu Hz\n", -- 1.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 15/15] OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded 2010-01-08 13:22 ` [PATCH 14/15] DSS2: Reject scaling settings when they cannot be supported Tomi Valkeinen @ 2010-01-08 13:22 ` Tomi Valkeinen 0 siblings, 0 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:22 UTC (permalink / raw) To: linux-omap, linux-fbdev; +Cc: Tomi Valkeinen If the panel's probe had failed, omapfb would still go on, eventually crashing. A better fix would be to handle each display properly, and leaving just the failed display out. But that is a bigger change. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> --- drivers/video/omap2/omapfb/omapfb-main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index e61a75c..d17caef 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c @@ -2115,6 +2115,11 @@ static int omapfb_probe(struct platform_device *pdev) dssdev = NULL; for_each_dss_dev(dssdev) { omap_dss_get_device(dssdev); + if (!dssdev->driver) { + dev_err(&pdev->dev, "no driver for display\n"); + r = -EINVAL; + goto cleanup; + } fbdev->displays[fbdev->num_displays++] = dssdev; } -- 1.6.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one 2010-01-08 13:22 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 10/15] OMAP: DSS2: Fix compile warning Tomi Valkeinen @ 2010-01-11 11:46 ` Grazvydas Ignotas 1 sibling, 0 replies; 23+ messages in thread From: Grazvydas Ignotas @ 2010-01-11 11:46 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: linux-omap, linux-fbdev On Fri, Jan 8, 2010 at 3:22 PM, Tomi Valkeinen <tomi.valkeinen@nokia.com> wrote: > There isn't really any reason to divide those. > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> > --- > MAINTAINERS | 13 ++----------- > 1 files changed, 2 insertions(+), 11 deletions(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 8d2fcee..d370787 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -3955,23 +3955,14 @@ L: linux-omap@vger.kernel.org > S: Maintained > F: drivers/video/omap/ > > -OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2) > +OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2) > M: Tomi Valkeinen <tomi.valkeinen@nokia.com> > L: linux-omap@vger.kernel.org > L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) Not that it's very important, but linux-fbdev is not really moderated (see other entries in this file), this is probably leftover from the old list (linux-fbdev-devel@lists.sourceforge.net). > S: Maintained > -F: drivers/video/omap2/dss/ > -F: drivers/video/omap2/vrfb.c > -F: drivers/video/omap2/vram.c > +F: drivers/video/omap2/ > F: Documentation/arm/OMAP/DSS > > -OMAP FRAMEBUFFER SUPPORT (FOR DSS2) > -M: Tomi Valkeinen <tomi.valkeinen@nokia.com> > -L: linux-omap@vger.kernel.org > -L: linux-fbdev@vger.kernel.org (moderated for non-subscribers) > -S: Maintained > -F: drivers/video/omap2/omapfb/ > - > OMAP MMC SUPPORT > M: Jarkko Lavinen <jarkko.lavinen@nokia.com> > L: linux-omap@vger.kernel.org > -- > 1.6.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API 2010-01-08 13:22 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 06/15] OMAP: OMAPFB: fix clk_get for RFBI Tomi Valkeinen @ 2010-01-08 16:52 ` Tony Lindgren 2010-01-11 9:09 ` Tomi Valkeinen 1 sibling, 1 reply; 23+ messages in thread From: Tony Lindgren @ 2010-01-08 16:52 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: linux-omap, linux-fbdev * Tomi Valkeinen <tomi.valkeinen@nokia.com> [100108 05:21]: > Compiles, but not tested. Heh, maybe update the comments on this one before asking Linus to pull? :) Tony ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API 2010-01-08 16:52 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tony Lindgren @ 2010-01-11 9:09 ` Tomi Valkeinen 2010-01-11 9:25 ` Sergey Lapin 0 siblings, 1 reply; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-11 9:09 UTC (permalink / raw) To: ext Tony Lindgren; +Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org On Fri, 2010-01-08 at 17:52 +0100, ext Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@nokia.com> [100108 05:21]: > > Compiles, but not tested. > > Heh, maybe update the comments on this one before asking > Linus to pull? :) Yes, perhaps that would be wise =). I hope somebody is able to test the patch, as I don't have hardware to test it. Tomi ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API 2010-01-11 9:09 ` Tomi Valkeinen @ 2010-01-11 9:25 ` Sergey Lapin 2010-01-12 10:35 ` Tomi Valkeinen 0 siblings, 1 reply; 23+ messages in thread From: Sergey Lapin @ 2010-01-11 9:25 UTC (permalink / raw) To: Tomi Valkeinen Cc: ext Tony Lindgren, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Hi, all! >> Heh, maybe update the comments on this one before asking >> Linus to pull? :) > > Yes, perhaps that would be wise =). I hope somebody is able to test the > patch, as I don't have hardware to test it. Is there some guidelines on porting old rfbi driver to dss2? Then I could test this one. Thanks a lot, S. ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API 2010-01-11 9:25 ` Sergey Lapin @ 2010-01-12 10:35 ` Tomi Valkeinen 0 siblings, 0 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-12 10:35 UTC (permalink / raw) To: ext Sergey Lapin Cc: ext Tony Lindgren, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org On Mon, 2010-01-11 at 10:25 +0100, ext Sergey Lapin wrote: > Hi, all! > > >> Heh, maybe update the comments on this one before asking > >> Linus to pull? :) > > > > Yes, perhaps that would be wise =). I hope somebody is able to test the > > patch, as I don't have hardware to test it. > Is there some guidelines on porting old rfbi driver to dss2? > Then I could test this one. Unfortunately no. You could look at panel-taal.c, which is a DSI command mode display, as that is quite similar to what an rfbi display would be. At some point I had a hackish port of N800 display to DSS2, but I didn't have time to keep it up to date, so I left it out. Perhaps I will port it again now that DSS2 is more stable (right... ;). Tomi ^ permalink raw reply [flat|nested] 23+ messages in thread
* RE: [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short 2010-01-08 13:22 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and send_null Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 02/15] OMAP: DSS2: DSI: print debug DCS cmd in hex Tomi Valkeinen @ 2010-01-08 13:29 ` Aguirre, Sergio 2010-01-08 13:33 ` Tomi Valkeinen 1 sibling, 1 reply; 23+ messages in thread From: Aguirre, Sergio @ 2010-01-08 13:29 UTC (permalink / raw) To: Tomi Valkeinen, linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Tomi, > -----Original Message----- > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > owner@vger.kernel.org] On Behalf Of Tomi Valkeinen > Sent: Friday, January 08, 2010 7:23 AM > To: linux-omap@vger.kernel.org; linux-fbdev@vger.kernel.org > Cc: Tomi Valkeinen > Subject: [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and > send_null > > - dsi_vc_send_short() needs to use dest_per for the peripheral id > - dsi_vc_send_null() was always using channel id 0 > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> > --- > drivers/video/omap2/dss/dsi.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c > index 5936487..c37bc5b 100644 > --- a/drivers/video/omap2/dss/dsi.c > +++ b/drivers/video/omap2/dss/dsi.c > @@ -1999,7 +1999,8 @@ static int dsi_vc_send_short(int channel, u8 > data_type, u16 data, u8 ecc) > return -EINVAL; > } > > - data_id = data_type | channel << 6; > + /* data_id = data_type | channel << 6; */ Why do you need this old line commented? Regards, Sergio > + data_id = data_type | dsi.vc[channel].dest_per << 6; > > r = (data_id << 0) | (data << 8) | (ecc << 24); > > @@ -2011,7 +2012,7 @@ static int dsi_vc_send_short(int channel, u8 > data_type, u16 data, u8 ecc) > int dsi_vc_send_null(int channel) > { > u8 nullpkg[] = {0, 0, 0, 0}; > - return dsi_vc_send_long(0, DSI_DT_NULL_PACKET, nullpkg, 4, 0); > + return dsi_vc_send_long(channel, DSI_DT_NULL_PACKET, nullpkg, 4, 0); > } > EXPORT_SYMBOL(dsi_vc_send_null); > > -- > 1.6.5 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 23+ messages in thread
* RE: [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short 2010-01-08 13:29 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short Aguirre, Sergio @ 2010-01-08 13:33 ` Tomi Valkeinen 0 siblings, 0 replies; 23+ messages in thread From: Tomi Valkeinen @ 2010-01-08 13:33 UTC (permalink / raw) To: ext Aguirre, Sergio Cc: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org On Fri, 2010-01-08 at 14:29 +0100, ext Aguirre, Sergio wrote: > Tomi, > > > -----Original Message----- > > From: linux-omap-owner@vger.kernel.org [mailto:linux-omap- > > owner@vger.kernel.org] On Behalf Of Tomi Valkeinen > > Sent: Friday, January 08, 2010 7:23 AM > > To: linux-omap@vger.kernel.org; linux-fbdev@vger.kernel.org > > Cc: Tomi Valkeinen > > Subject: [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and > > send_null > > > > - dsi_vc_send_short() needs to use dest_per for the peripheral id > > - dsi_vc_send_null() was always using channel id 0 > > > > Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> > > --- > > drivers/video/omap2/dss/dsi.c | 5 +++-- > > 1 files changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c > > index 5936487..c37bc5b 100644 > > --- a/drivers/video/omap2/dss/dsi.c > > +++ b/drivers/video/omap2/dss/dsi.c > > @@ -1999,7 +1999,8 @@ static int dsi_vc_send_short(int channel, u8 > > data_type, u16 data, u8 ecc) > > return -EINVAL; > > } > > > > - data_id = data_type | channel << 6; > > + /* data_id = data_type | channel << 6; */ > > Why do you need this old line commented? Ah. I don't =). Thanks. Tomi ^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2010-01-12 10:35 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-01-08 13:22 [PATCH 00/15] OMAP DSS fixes Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short and send_null Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 02/15] OMAP: DSS2: DSI: print debug DCS cmd in hex Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 03/15] OMAP: DSS2: Collect interrupt statistics Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 04/15] OMAP: DSS2: Fix crash when panel doesn't define enable_te() Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 06/15] OMAP: OMAPFB: fix clk_get for RFBI Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 07/15] OMAP: OMAPFB: add dummy release function for omapdss Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 08/15] MAINTAINERS: change omapfb maintainer Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one entry Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 10/15] OMAP: DSS2: Fix compile warning Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 11/15] video/omap: add __init/__exit macros to drivers/video/omap/lcd_htcherald.c Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 12/15] OMAP: DSS2: OMAPFB: fix omapfb_free_fbmem() Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 13/15] OMAP: DSS2: Make check-delay-loops consistent Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 14/15] DSS2: Reject scaling settings when they cannot be supported Tomi Valkeinen 2010-01-08 13:22 ` [PATCH 15/15] OMAP: DSS2: OMAPFB: fix crash when panel driver was not loaded Tomi Valkeinen 2010-01-11 11:46 ` [PATCH 09/15] MAINTAINERS: Combine DSS2 and OMAPFB2 into one Grazvydas Ignotas 2010-01-08 16:52 ` [PATCH 05/15] OMAP: DSS2: RFBI: convert to new kfifo API Tony Lindgren 2010-01-11 9:09 ` Tomi Valkeinen 2010-01-11 9:25 ` Sergey Lapin 2010-01-12 10:35 ` Tomi Valkeinen 2010-01-08 13:29 ` [PATCH 01/15] OMAP: DSS2: DSI: fix VC channels in send_short Aguirre, Sergio 2010-01-08 13:33 ` Tomi Valkeinen
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).