Re: [GIT PULL] OMAP DSS for v3.7
Hi Tomi, On 10/01/2012 07:45 PM, Tomi Valkeinen wrote: Hi Florian, Here are omapdss changes for 3.7 merge window. Merged. There's something funny with the diff stat, though. I can see a few changes there that I have not made, for example to drivers/video/console/fbcon.c. I believe they come from my Merge branch 'fbdev-for-linus' of git://github.com/schandinat/linux-2.6, although I don't know why they show up in the diff stat. Yeah, I know this sort of stuff, had some similar problem some time ago, it happens when you base on multiple branches. Basically you created your pull request as if you asked Linus to pull it as you started with a commit that is in Linus' tree (but not in mine). If you would take the HEAD of my tree you wouldn't see the fb stuff but others as you merged from Linus in the meantime. Merge with v3.6 goes without conflicts, but there will be some conflicts with OMAP platform stuff, at least according to linux-next reports. Those conflicts are trivial, though. Good. Thanks, Florian Tobias Schandinat Tomi The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d: Linux 3.6-rc4 (2012-09-01 10:39:58 -0700) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git tags/omapdss-for-3.7 for you to fetch changes up to 13b1ba7de8d0ecc42e4f9c002d5b0c1a48f05e58: OMAPDSS: add missing include for string.h (2012-09-28 10:03:03 +0300) Omapdss driver changes for the 3.7 merge window. Notable changes: * Basic writeback support for DISPC level. Writeback is not yet usable, though, as we need higher level code to actually expose the writeback feature to userspace. * Rewriting the omapdss output drivers. We're trying to remove the hard links between the omapdss and the panels, and this rewrite work moves us closer to that goal. * Cleanup and restructuring patches that have been made while working on device tree support for omapdss. Device tree support is still some way ahead, but these patches are good cleanups in themselves. * Basic OMAP5 DSS support for DPI and DSI outputs. * Workaround for the problem that GFX overlay's fifo is too small for high resolution scenarios, causing underflows. * Cleanups that remove dependencies to omap platform code. Archit Taneja (70): OMAPDSS: APPLY: Constify timings argument in dss_mgr_set_timings OMAPDSS: DPI: Add locking for DPI interface OMAPDSS: Displays: Add locking in generic DPI panel driver OMAPDSS: DPI: Maintain our own timings field in driver data OMAPDSS: DPI displays: Take care of panel timings in the driver itself OMAPDSS: DSI: Maintain own copy of timings in driver data OMAPDSS: DSI: Add function to set panel size for command mode panels OMAPDSS: DSI: Update manager timings on a manual update OMAPDSS: HDMI: Use our own omap_video_timings field when setting interface timings OMAPDSS: HDMI: Add locking for hdmi interface set timing functions OMAPDSS: SDI: Create a function to set timings OMAPDSS: SDI: Maintain our own timings field in driver data OMAPDSS: VENC: Split VENC into interface and panel driver OMAPDSS: VENC: Maintain our own timings field in driver data OMAPDSS: RFBI: Remove partial update support OMAPDSS: RFBI: Add function to set panel size OMAPDSS: DSI: Maintain copy of pixel format in driver data OMAPDSS: RFBI: Maintain copy of pixel size in driver data OMAPDSS: RFBI: Maintain copy of number of data lines in driver data OMAPDSS: DPI: Maintain copy of number of data lines in driver data OMAPDSS: SDI: Maintain copy of data pairs in driver data OMAPDSS: DSI: Maintain copy of operation mode in driver data OMAPDSS: DSI: Rename dsi_videomode_data to dsi_videomode_timings OMAPDSS: DSI: Maintain copy of video mode timings in driver data OMAPDSS: RFBI: Maitain copy of rfbi timings in driver data OMAPDSS: VENC: Maintain copy of venc type in driver data OMAPDSS: VENC: Maintian copy of video output polarity info in private data OMAPFB: Clear framebuffers before they are registered OMAPDSS: Add basic omap5 features to dss and dispc OMAPDSS: DSI: Pass dsi platform device wherever possible OMAPDSS: APPLY: Remove omap_dss_device references in wait_for_go functions OMAPDSS: outputs: Create a new entity called outputs OMAPDSS: outputs: Create and register output instances OMAPDSS: output: Add set/unset device ops for omap_dss_output OMAPDSS: APPLY: Add manager set/unset output ops for omap_overlay_manager OMAPDSS: Remove manager-device references OMAP_VOUT: Remove manager-device references OMAPFB: remove manager-device references
Re: [PATCH 0/2] OMAPDSS: fixes for -rc
Hi Tomi, On 08/21/2012 06:09 AM, Tomi Valkeinen wrote: Hi Florian, Here are two small fixes for omapfb and omapdss. The first one fixes an old bug that causes colors to be wrong on fb console. The other fixes SDI output that got broken in the previous merge window. Applied both patches. (The first is actually 2/2) Thanks, Florian Tobias Schandinat Tomi Grazvydas Ignotas (1): OMAPFB: fix framebuffer console colors Tomi Valkeinen (1): OMAPDSS: Fix SDI PLL locking drivers/video/omap2/dss/sdi.c| 14 ++ drivers/video/omap2/omapfb/omapfb-main.c |2 +- 2 files changed, 15 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2] da8xx-fb: add missing FB_BLANK operations
On 07/06/2012 02:01 PM, yegorsli...@googlemail.com wrote: From: Yegor Yefremov yegorsli...@googlemail.com add FB_BLANK_NORMAL, FB_BLANK_VSYNC_SUSPEND and FB_BLANK_HSYNC_SUSPEND modes (copy drivers/video/omap2/omapfb/omapfb-main.c implementation). Otherwise X-server will complain about invalid parameter. Signed-off-by: Yegor Yefremov yegorsli...@googlemail.com Applied. Thanks, Florian Tobias Schandinat --- v2: add linux-fbdev as recipient drivers/video/da8xx-fb.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 47118c7..8d745bf 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -1026,6 +1026,9 @@ static int cfb_blank(int blank, struct fb_info *info) lcd_enable_raster(); break; + case FB_BLANK_NORMAL: + case FB_BLANK_VSYNC_SUSPEND: + case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_POWERDOWN: if (par-panel_power_ctrl) par-panel_power_ctrl(0); -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS for v3.6
Hi Tomi, On 07/22/2012 06:13 PM, Tomi Valkeinen wrote: Hi Florian, Here are OMAP DSS changes for 3.6. The main changes are: - Patches from Archit, which reorganize the output side of omapdss. This is much cleaner in itself, but will also help us in the future to implement the missing omap4 features and omap5+ features. - LCD3 patches from Chandrabhanu, which implement the support for LCD3 overlay manager (for omap5). His patches also generalize the code which accesses the overlay manager related registers. There hasn't been new patches applied to the DSS tree for 3 weeks, as I'm on vacation. The tree has been in linux-next for that period, and I haven't received any complaints so I hope the stuff works quite well. Archit also reported that he has tested the linux-next, and it seems to work fine. There is a small conflict, though. This was caused by the two fixes OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n and OMAPDSS: Use PM notifiers for system suspend, as I had already applied them into my master branch before Archit sent them for you. And as you fixed the code formatting issue (sorry about that), we have a small conflict there. The conflict is trivial to resolve, and I also pushed for-florian-merged branch to the same git tree below, which has the conflict resolved. I'm still on vacation for the next week, but I'll check my email every now and then to see if there are any issues. Tomi The following changes since commit cfaf025112d3856637ff34a767ef785ef5cf2ca9: Linux 3.5-rc2 (2012-06-08 18:40:09 -0700) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-florian Merged. Thanks, Florian Tobias Schandinat for you to fetch changes up to 974a65825e0b5fbda49605f0416a2c975d66e9e6: Merge Apply LCD manager related parameters from Archit (2012-06-29 14:13:07 +0300) Archit Taneja (27): OMAPDSS: Remove passive matrix LCD support (part 1) OMAPDSS: Remove passive matrix LCD support (part 2) OMAPDSS: Remove passive matrix LCD support (part 3) OMAPDSS: Remove passive matrix LCD support (part 4) OMAPDSS: Add some new fields to omap_video_timings OMAPDSS: DISPLAY: Ignore newly added omap_video_timings fields for display timings sysfs file OMAPDSS: DISPC: Configure newly added omap_video_timing fields OMAPDSS: DISPC: Remove dispc_mgr_set_pol_freq() OMAPFB: Map the newly added omap_video_timings fields with fb sync flags OMAPDSS: Remove omap_panel_config enum from omap_dss_device OMAPDSS: Add interlace parameter to omap_video_timings OMAPDSS: DISPC/APPLY: Use interlace info in manager timings for dispc_ovl_setup() OMAPFB: Map interlace field in omap_video_timings with fb vmode flags OMAPDSS: HDMI: Remove custom hdmi_video_timings struct OMAPDSS: DSI: Fix HSYNC, VSYNC and DE polarities between DISPC and DSI OMAPDSS: DISPC: Change return type of dispc_mgr_set_clock_div() OMAPDSS: Add struct to hold LCD overlay manager configuration OMAPDSS: DPI: Configure dss_lcd_mgr_config struct with lcd manager parameters OMAPDSS: RFBI: Configure dss_lcd_mgr_config struct with lcd manager parameters OMAPDSS: DSI: Configure dss_lcd_mgr_config struct with lcd manager parameters OMAPDSS: SDI: Configure dss_lcd_mgr_config struct with lcd manager parameters OMAPDSS: APPLY: Remove DISPC writes to manager's lcd parameters in interface drivers OMAPDSS: MANAGER: Check LCD related overlay manager parameters OMAPDSS: APPLY: Remove usage of omap_dss_device from manual/auto update checks OMAPDSS: DISPC: Remove a redundant function OMAPDSS: RFBI: Use dss_mgr_enable to enable the overlay manager OMAPDSS: OVERLAY: Clean up replication checking Chandrabhanu Mahapatra (5): OMAPDSS: Cleanup implementation of LCD channels OMAPDSS: Add support for LCD3 channel OMAPDSS: Add LCD3 overlay manager and Clock and IRQ support OMAPDSS: Add dump and debug support for LCD3 ARM: OMAP2PLUS: DSS: Disable LCD3 output when resetting DSS Jassi Brar (2): OMAPDSS: HDMI: Discard phy_tx_enabled member OMAPDSS: HDMI: Replace spinlock with mutex in hdmi_check_hpd_state Peter Meerwald (1): OMAPDSS: fix specification spelling in Kconfig Rajendra Nayak (1): OMAPDSS: add clk_prepare_enable and clk_disable_unprepare Tomi Valkeinen (6): Merge tag 'v3.5-rc2' OMAPDSS: remove enum omap_dss_overlay_managers OMAPDSS: Use PM notifiers for system suspend OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n Merge Misc DSS clean ups from Archit Merge Apply LCD manager related parameters from Archit arch/arm/mach-omap2/display.c | 29 +- drivers/video/omap2/displays/panel
Re: [PATCH 0/2] OMAPDSS: PM runtime fixes for 3.5-rc
Hi Archit, On 07/04/2012 12:43 PM, Archit Taneja wrote: Hi Florian, These are 2 fixes which Tomi had intended to push for the coming rcs. He is currently on vacation and asked me to post the patches on his behalf. The first patch ensures that system suspend doesn't break on OMAP if DSS is enabled. The second patch prevents some warning backtraces when the kernel is not built with PM runtime. Could you please queue these for the upcoming rc? as you sent me those patches you should have added your Signed-off-by as well, I added it. Also the first patch of this series contained 2 coding style issues related to braces that checkpatch complained about and also differed from the coding style used in those files, I fixed those as well. I applied both patches. Thanks, Florian Tobias Schandinat Thanks, Archit Tomi Valkeinen (2): OMAPDSS: Use PM notifiers for system suspend OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n drivers/video/omap2/dss/core.c | 45 +-- drivers/video/omap2/dss/dispc.c |2 +- drivers/video/omap2/dss/dsi.c |2 +- drivers/video/omap2/dss/dss.c |2 +- drivers/video/omap2/dss/hdmi.c |2 +- drivers/video/omap2/dss/rfbi.c |2 +- drivers/video/omap2/dss/venc.c |2 +- 7 files changed, 35 insertions(+), 22 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS for v3.5-rc2
Hi Tomi, On 06/05/2012 03:11 PM, Tomi Valkeinen wrote: Hi Florian, Here are 5 small fixes for omapdss. The most important is the fix registration... patch, without which omapdss crashes when suspending/resuming. The compilation bug (fix build...) is also rather annoying for those users not interested in debug outputs. The rest are quite minor small fixes. It'd be great if these made it in for -rc2, as the crash bug is quite bad, but -rc3 is good also. I merged this some days ago. Sorry that I didn't realize that rc2 would be released early and hence didn't manage to get it in. Best regards, Florian Tobias Schandinat Tomi The following changes since commit e92a5b28f71aea01b281f9c89d97a4bc5b24748f: OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request (2012-05-22 11:00:09 +0300) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git tags/omapdss-for-3.5-rc2 for you to fetch changes up to c3a21fc79b6bc097d8b0e47498903a649a27: OMAPDSS: fix registration of DPI and SDI devices (2012-06-05 17:15:24 +0300) Small fixes for omapdss driver. Most importantly, fixes a build problem when debugfs or omapdss debug support is turned off, and fixes a suspend related crash. Archit Taneja (1): OMAPDSS: DSI: Fix bug when calculating LP command interleaving parameters Tomi Valkeinen (4): OMAPDSS: fix build when DEBUG_FS or DSS_DEBUG_SUPPORT disabled OMAPDSS: Taal: fix compilation warning OMAPDSS: fix bogus WARN_ON in dss_runtime_put() OMAPDSS: fix registration of DPI and SDI devices arch/arm/mach-omap2/display.c |4 ++-- drivers/video/omap2/displays/panel-taal.c |2 +- drivers/video/omap2/dss/core.c|3 +-- drivers/video/omap2/dss/dsi.c |2 +- drivers/video/omap2/dss/dss.c |2 +- 5 files changed, 6 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS for v3.5
On 05/22/2012 10:09 AM, Tomi Valkeinen wrote: Hi Florian, Here are the OMAP DSS changes for 3.5. Merged. Thanks, Florian Tobias Schandinat I really tried this time to send the pull request early, but here I am again, sending it when the merge window has already opened... A few late-found bugs caused some unnecessary delays. I'm using github this time instead of gitorious, as gitorious seems to be down. This is my first pull request with a signed tag, I hope everything is correct. Note that there's a merge for small branch with omap board file changes (e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07) that is also pulled by Tony for the linux-omap tree. This is meant to help avoid conflicts in the board files. Tomi The following changes since commit 66f75a5d028beaf67c931435fdc3e7823125730c: Linux 3.4-rc4 (2012-04-21 14:47:52 -0700) are available in the git repository at: git://github.com/tomba/linux.git tags/omapdss-for-3.5 for you to fetch changes up to e92a5b28f71aea01b281f9c89d97a4bc5b24748f: OMAPDSS: HDMI: OMAP4: Update IRQ flags for the HPD IRQ request (2012-05-22 11:00:09 +0300) Omapdss driver changes for 3.5 merge window. Lots of normal development commits, but perhaps most notable changes are: * HDMI rework to properly decouple the HDMI audio part from the HDMI video part. * Restructure omapdss core driver so that it's possible to implement device tree support. This included changing how platform data is passed to the drivers, changing display device registration and improving the panel driver's ability to configure the underlying video output interface. * Basic support for DSI packet interleaving Archit Taneja (19): OMAPDSS: DISPC/RFBI: Use dispc_mgr_set_lcd_timings() for setting lcd size OMAPDSS: DISPC: Use a common function to set manager timings OMAPDSS: DISPC: Clean up manager timing/size functions OMAPDSS: HDMI: Fix ti_hdmi_4xxx_core_dump OMAPDSS: HDMI: define and dump CORE registers in correct order OMAPDSS: Fix DSI_FCLK clock source selection OMAPDSS: DISPC: Remove Fake VSYNC support OMAPDSS: APPLY: Add manager timings as extra_info in private data OMAPDSS: Apply manager timings instead of direct DISPC writes OMAPDSS: MANAGER: Create a function to check manager timings OMAPDSS: APPLY: Don't check manager settings if it is disabled OMAPDSS: APPLY: Remove display dependency from overlay and manager checks OMAPDSS: DPI/HDMI: Apply manager timings even if panel is disabled OMAPDSS: APPLY: Remove an unnecessary omap_dss_device pointer OMAPDSS: DISPC: Remove omap_dss_device pointer usage from dispc_mgr_pclk_rate() OMAPDSS: DISPC: Remove usage of dispc_mgr_get_device() OMAPDSS: DSI: Support command mode interleaving during video mode blanking periods OMAPDSS: VENC/DISPC: Delay dividing Y resolution for managers connected to VENC OMAPDSS: Apply VENC timings even if panel is disabled Axel Castaneda Gonzalez (1): OMAPDSS: HDMI: Decouple wrapper enable/disable and audio start/stop Chandrabhanu Mahapatra (5): OMAPDSS: DISPC: Enable predecimation OMAPDSS: DISPC: Handle synclost errors in OMAP3 OMAPDSS: DISPC: Correct DISPC functional clock usage OMAPDSS: DISPC: Update Accumulator configuration for chroma plane OMAPDSS: DISPC: Support rotation through TILER Grazvydas Ignotas (5): OMAPDSS: OMAPFB: check for matching memory size early OMAPDSS: provide default get_timings function for panels OMAPDSS: TPO-TD03MTEA1: add set/check timing functions OMAPDSS: VENC: allow switching venc output type at runtime OMAPDSS: OMAPFB: always allow to configure overlay Jan Weitzel (1): ARM: OMAP2+ Add Primview displays to panel-generic Mark Brown (4): OMAP: DSS2: Remove suspicous and unused TAAL regulator API usage OMAPDSS: VENC: Check for errors from regulator_enable() OMAPDSS: TPO-TD03MTEA1: Check for errors from regulator_enable() OMAPDSS: TPO-TD03MTEA1: Correct comment for power on delay Peter Meerwald (1): OMAPFB: remove unused FB_OMAP_BOOTLOADER_INIT config option Ricardo Neri (15): OMAPDSS: Provide an interface for audio support OMAPDSS: HDMI: Split audio_enable into audio_enable/disable OMAPDSS: HDMI: Split video_enable into video_enable/disable OMAPDSS: HDMI: Remove ASoC codec OMAPDSS: HDMI: OMAP4: Remove CEA-861 audio infoframe and IEC-60958 enums OMAPDSS: HDMI: OMAP4: Remove invalid I2S settings OMAPDSS: HDMI: Decouple HDMI audio from ASoC OMAPDSS: HDMI: OMAP4: Expand configuration for IEC-60958 audio OMAPDSS: HDMI: Relocate N/CTS calculation OMAPDSS: HDMI: Add
Re: [GIT PULL] OMAP DSS for v3.4
Arnd, On 03/19/2012 04:24 PM, Arnd Bergmann wrote: I've looked at the specific conflicts again, and it seems that the only conflicting commit in arm-soc is 2e3ee9f45b ARM: OMAP1: Move most of plat/io.h into local iomap.h. I'm planning to send that one very early, as soon as Russell has his first set up patches merged, so I don't actually have to resolve the conflict here unless Florian is also there early. just for your info, I am going to send my pull request today. As I didn't find any pull request from you until now, I didn't pull any of the branches below. Best regards, Florian Tobias Schandinat Florian, if I end up being faster than you, feel free to pull the omap/cleanup branch from git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git if you want to get a conflict resolution using the minimum set of patches from upstream. Alternatively, pulling cleanup from git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap should give you the same. Arnd -- To unsubscribe from this list: send the line unsubscribe linux-fbdev in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS for v3.4
On 03/19/2012 11:01 AM, Tomi Valkeinen wrote: Hi Florian, Arnd, Here are the changes for OMAP DSS driver for v3.4. There's an issue with the dss driver that appears on arm-soc/for-next branch, which I'm still solving (http://marc.info/?l=linux-omapm=133214966902577w=2). I hope to get fix for that ready and merged for -rc1, but I'm not sure if I can make it in time, so I wanted to sent this pull request already. Arnd, as discussed before, you can also merge this branch to solve the conflicts between arm-soc and omapdss trees. Note that this is the first pull request I've sent with a branch that I have not been rebasing, so please check that the branch looks sane. Tomi The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7: Linux 3.3 (2012-03-18 16:15:34 -0700) Interesting, I never tried to start at a commit that is not part of the branch. Good to know that it does work. are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-3.4 Merged. Thanks, Florian Tobias Schandinat Archit Taneja (2): OMAPDSS: Features: Maintain dss_feats as a list OMAPDSS: DISPC: Fix scaling constraints for OMAP4 Danny Kukawka (1): OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on OMAP4 Grazvydas Ignotas (2): OMAPDSS: TPO-TD03MTEA1: fix suspend hang OMAPDSS: TPO-TD03MTEA1: update default gamma Julia Lawall (1): OMAPDSS: use devm_ functions Lajos Molnar (3): OMAPDSS: DISPC: Fix OMAP4 supported color formats OMAPDSS: DISPC: Fix FIR coefficients OMAPDSS: MANAGER/APPLY: Add runtime_pm protection around wait_for_go/vsync functions Mythri P K (6): OMAPDSS: HDMI: remove duplicate video interface code OMAPDSS: HDMI: update static timing table OMAPDSS: HDMI: change the timing match logic OMAPDSS: HDMI: remove duplicate code and mode parameter OMAPDSS: HDMI: Move Avi-infoframe struct to hdmi_ip_data OMAPDSS: HDMI: Add M2 divider while calculating clkout Ricardo Neri (4): OMAPDSS: HDMI: Correct source of the pixel clock in ACR calculation OMAPDSS: Add DSS feature for HDMI MCLK for audio OMAPDSS: HDMI: Implement initialization of MCLK OMAPDSS: HDMI: Modify logic to configure MCLK Tomi Valkeinen (29): OMAPDSS: FEAT: Add FIFO_MERGE feature OMAPDSS: APPLY: add fifo merge support funcs OMAPDSS: APPLY: add fifo-merge support OMAPDSS: DISPC: print fifo threshold values in bytes OMAPDSS: DISPC: move fifo threhold calc to dispc.c OMAPDSS: DISPC: Add naive threshold calc for fifomerge Merge branch 'work/fifomerge' Merge commit 'v3.3-rc4' OMAPDSS: cleanup probe functions OMAPFB: remove old blizzard driver OMAPFB: Remove OMAP2/3 support from old omapfb driver OMAPDSS: Remove video SRAM support OMAPFB: Remove video SRAM support (old omapfb) OMAP2+: remove unneeded #include omapfb.h OMAP: N770: remove HWA742 platform data OAMPFB: remove unused omapfb_set_ctrl_platform_data() OMAPFB: remove early mem alloc from old omapfb OMAPFB: remove mem info from platform_data OMAPFB: remove unused fb_format_to_dss_mode() OMAPFB: Move old omapfb private structs to a private include file OMAPFB: remove omapfb_set_platform_data() OMAP1: pass LCD config with omapfb_set_lcd_config() OMAP: Remove OMAP_TAG_LCD and OMAP_TAG_FBMEM OMAP1: Remove unused LCD devices from board files OMAPFB: remove remaining OMAP arch checks Merge branch 'work/old-omapfb-removal' Merge commit 'v3.3-rc6' OMAPDSS: APPLY: print warning if wait_pending_extra_info_updates fails OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update Tony Lindgren (1): ARM: OMAP2+: Fix compile error when FB_OMAP2 is not set Yegor Yefremov (1): OMAPDSS: add Innolux AT080TN52 display support arch/arm/mach-omap1/board-ams-delta.c |9 +- arch/arm/mach-omap1/board-fsample.c| 15 +- arch/arm/mach-omap1/board-h2.c | 15 +- arch/arm/mach-omap1/board-h3.c |9 +- arch/arm/mach-omap1/board-htcherald.c |9 +- arch/arm/mach-omap1/board-innovator.c | 11 +- arch/arm/mach-omap1/board-nokia770.c | 19 +- arch/arm/mach-omap1/board-osk.c| 14 +- arch/arm/mach-omap1/board-palmte.c | 10 +- arch/arm/mach-omap1/board-palmtt.c | 10 +- arch/arm/mach-omap1/board-palmz71.c| 10 +- arch/arm/mach-omap1/board-perseus2.c | 15 +- arch/arm/mach-omap1/board-sx1.c| 16 +- arch/arm/mach-omap2/io.c |1 - arch/arm/plat-omap/common.c|2
Re: [GIT PULL] OMAP DSS for v3.4
On 03/21/2012 12:39 PM, Tomi Valkeinen wrote: From 849c07b1fd3d9f23e8ed94436b6221f8652462c0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen tomi.valkei...@ti.com Date: Mon, 19 Mar 2012 15:05:02 +0200 Subject: [PATCH] OMAPDSS: register dss drivers in module init We do the dss driver registration in a rather strange way: we have the higher level omapdss driver, and we use that driver's probe function to register the drivers for the rest of the dss devices. There doesn't seem to be any reason for that, and additionally the soon-to-be-merged patch ARM: OMAP: omap_device: remove omap_device_parent will break omapdss initialization with the current registration model. This patch changes the registration for all drivers to happen at the same place, in the init of the module. Signed-off-by: Tomi Valkeinen tomi.valkei...@ti.com Applied. Thanks, Florian Tobias Schandinat --- drivers/video/omap2/dss/core.c | 135 +++- 1 files changed, 77 insertions(+), 58 deletions(-) diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 8613f86..e8a1207 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -183,42 +183,6 @@ static int omap_dss_probe(struct platform_device *pdev) dss_init_overlay_managers(pdev); dss_init_overlays(pdev); - r = dss_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize DSS platform driver\n); - goto err_dss; - } - - r = dispc_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize dispc platform driver\n); - goto err_dispc; - } - - r = rfbi_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize rfbi platform driver\n); - goto err_rfbi; - } - - r = venc_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize venc platform driver\n); - goto err_venc; - } - - r = dsi_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize DSI platform driver\n); - goto err_dsi; - } - - r = hdmi_init_platform_driver(); - if (r) { - DSSERR(Failed to initialize hdmi\n); - goto err_hdmi; - } - r = dss_initialize_debugfs(); if (r) goto err_debugfs; @@ -246,18 +210,6 @@ static int omap_dss_probe(struct platform_device *pdev) err_register: dss_uninitialize_debugfs(); err_debugfs: - hdmi_uninit_platform_driver(); -err_hdmi: - dsi_uninit_platform_driver(); -err_dsi: - venc_uninit_platform_driver(); -err_venc: - dispc_uninit_platform_driver(); -err_dispc: - rfbi_uninit_platform_driver(); -err_rfbi: - dss_uninit_platform_driver(); -err_dss: return r; } @@ -269,13 +221,6 @@ static int omap_dss_remove(struct platform_device *pdev) dss_uninitialize_debugfs(); - hdmi_uninit_platform_driver(); - dsi_uninit_platform_driver(); - venc_uninit_platform_driver(); - rfbi_uninit_platform_driver(); - dispc_uninit_platform_driver(); - dss_uninit_platform_driver(); - dss_uninit_overlays(pdev); dss_uninit_overlay_managers(pdev); @@ -525,6 +470,80 @@ static int omap_dss_bus_register(void) /* INIT */ +static int __init omap_dss_register_drivers(void) +{ + int r; + + r = platform_driver_register(omap_dss_driver); + if (r) + return r; + + r = dss_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize DSS platform driver\n); + goto err_dss; + } + + r = dispc_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize dispc platform driver\n); + goto err_dispc; + } + + r = rfbi_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize rfbi platform driver\n); + goto err_rfbi; + } + + r = venc_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize venc platform driver\n); + goto err_venc; + } + + r = dsi_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize DSI platform driver\n); + goto err_dsi; + } + + r = hdmi_init_platform_driver(); + if (r) { + DSSERR(Failed to initialize hdmi\n); + goto err_hdmi; + } + + return 0; + +err_hdmi: + dsi_uninit_platform_driver(); +err_dsi: + venc_uninit_platform_driver(); +err_venc: + rfbi_uninit_platform_driver(); +err_rfbi: + dispc_uninit_platform_driver(); +err_dispc: + dss_uninit_platform_driver(); +err_dss: + platform_driver_unregister(omap_dss_driver); + + return r; +} + +static void __exit omap_dss_unregister_drivers(void
Re: [PATCH 0/2] OMAPDSS: small fixes for 3.3 rc
Hi Tomi, On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: Hi, Two small fixes for omapdss. Florian, if the patches are ok, I guess it's easier if you just apply these patches from email, instead of me sending a pull request? Yes, that's correct as those are only a few patches and as we are already in late -rc's (and therefore I guess, I should take a better look at what I apply). I'll add some comments to your patches in separate mails. Best regards, Florian Tobias Schandinat Tomi Tomi Valkeinen (2): OMAPDSS: panel-dvi: Add Kconfig dependency on I2C OMAPDSS: APPLY: make ovl_enable/disable synchronous drivers/video/omap2/displays/Kconfig |2 +- drivers/video/omap2/dss/apply.c |6 ++ 2 files changed, 7 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] OMAPDSS: panel-dvi: Add Kconfig dependency on I2C
On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: panel-dvi uses i2c, but the Kconfig didn't have dependency on I2C. Add it. Signed-off-by: Tomi Valkeinen tomi.valkei...@ti.com --- drivers/video/omap2/displays/Kconfig |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig index 74d29b5..408a992 100644 --- a/drivers/video/omap2/displays/Kconfig +++ b/drivers/video/omap2/displays/Kconfig @@ -12,7 +12,7 @@ config PANEL_GENERIC_DPI config PANEL_DVI tristate DVI output - depends on OMAP2_DSS_DPI + depends on OMAP2_DSS_DPI I2C It's just a matter of taste, but are you sure you want to depend on it and not select it? Other drivers tend to use select for I2C, for me it doesn't really matter. Best regards, Florian Tobias Schandinat help Driver for external monitors, connected via DVI. The driver uses i2c to read EDID information from the monitor. -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] OMAPDSS: APPLY: make ovl_enable/disable synchronous
On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: ovl-enable/disable are meant to be synchronous so that they can handle the configuration of fifo sizes. The current kernel doesn't configure fifo sizes yet, and so the code doesn't need to block to function (from omapdss driver's perspective). However, for the users of omapdss a non-blocking ovl-disable is confusing, because they don't know when the memory area is not used any more. Furthermore, when the fifo size configuration is added in the next merge window, the change from non-blocking to blocking could cause side effects to the users of omapdss. So by making the functions block already will keep them behaving in the same manner. Is there any difference to doing it now? I agree that this should be fixed but if we can't avoid breaking users I'd prefer to break them in a merge window not in late rc stage. Or did we introduce these functions just in the last merge window? Best regards, Florian Tobias Schandinat And, while not the main purpose of this patch, this will also remove the compile warning: drivers/video/omap2/dss/apply.c:350: warning: 'wait_pending_extra_info_updates' defined but not used Signed-off-by: Tomi Valkeinen tomi.valkei...@ti.com --- drivers/video/omap2/dss/apply.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/video/omap2/dss/apply.c b/drivers/video/omap2/dss/apply.c index 052dc87..87b3e25 100644 --- a/drivers/video/omap2/dss/apply.c +++ b/drivers/video/omap2/dss/apply.c @@ -1276,6 +1276,9 @@ int dss_ovl_enable(struct omap_overlay *ovl) spin_unlock_irqrestore(data_lock, flags); + /* wait for overlay to be enabled */ + wait_pending_extra_info_updates(); + mutex_unlock(apply_lock); return 0; @@ -1313,6 +1316,9 @@ int dss_ovl_disable(struct omap_overlay *ovl) spin_unlock_irqrestore(data_lock, flags); + /* wait for the overlay to be disabled */ + wait_pending_extra_info_updates(); + mutex_unlock(apply_lock); return 0; -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] OMAPDSS: APPLY: make ovl_enable/disable synchronous
Hi Tomi, On 02/29/2012 10:30 AM, Tomi Valkeinen wrote: On Wed, 2012-02-29 at 10:13 +, Florian Tobias Schandinat wrote: On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: ovl-enable/disable are meant to be synchronous so that they can handle the configuration of fifo sizes. The current kernel doesn't configure fifo sizes yet, and so the code doesn't need to block to function (from omapdss driver's perspective). However, for the users of omapdss a non-blocking ovl-disable is confusing, because they don't know when the memory area is not used any more. Furthermore, when the fifo size configuration is added in the next merge window, the change from non-blocking to blocking could cause side effects to the users of omapdss. So by making the functions block already will keep them behaving in the same manner. Is there any difference to doing it now? I agree that this should be fixed but if we can't avoid breaking users I'd prefer to break them in a merge window not in late rc stage. Or did we introduce these functions just in the last merge window? Yes, these were introduced in the merge window. And I explicitly said the functions are blocking so that they can perform their job. And just to clarify, the functions already use a mutex, so in that sense they are blocking. They just don't currently wait until the HW has finished with the overlay. okay, than I'll apply this patch as is. I was just worried about asking Linus to pull something that is labled as Breaks existing users now, but that doesn't look like an issue here. Best regards, Florian Tobias Schandinat The problem was raised by Rob Clark, who's writing the omapdrm driver, as he doesn't have a way to ensure that the overlay has been truly disabled and the memory is is no longer in use. (I forgot to cc him for the patch, adding him now). Tomi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] OMAPDSS: panel-dvi: Add Kconfig dependency on I2C
Hi Tomi, On 02/29/2012 10:21 AM, Tomi Valkeinen wrote: On Wed, 2012-02-29 at 10:03 +, Florian Tobias Schandinat wrote: On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: panel-dvi uses i2c, but the Kconfig didn't have dependency on I2C. Add it. Signed-off-by: Tomi Valkeinen tomi.valkei...@ti.com --- drivers/video/omap2/displays/Kconfig |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/video/omap2/displays/Kconfig b/drivers/video/omap2/displays/Kconfig index 74d29b5..408a992 100644 --- a/drivers/video/omap2/displays/Kconfig +++ b/drivers/video/omap2/displays/Kconfig @@ -12,7 +12,7 @@ config PANEL_GENERIC_DPI config PANEL_DVI tristate DVI output - depends on OMAP2_DSS_DPI + depends on OMAP2_DSS_DPI I2C It's just a matter of taste, but are you sure you want to depend on it and not select it? Other drivers tend to use select for I2C, for me it doesn't really matter. Well, I'd like to select, but I don't think that's correct. From Documentation/kbuild/kconfig-language.txt: In general use select only for non-visible symbols (no prompts anywhere) and for symbols with no dependencies. But I do see quite many selects for I2C, so I'm not sure if all those are wrong, or has it just been decided that I2C is a valid target for select. I'd say that the above is only a guideline but not absolute rule. For I2C I'd argue that I probably wouldn't even know that my hardware has it if I weren't the one writing the driver using it. But it's true that select should be used with care as it is much easier to get the config messed up by using it. Using depend is in line with the other panel drivers in the same directory. I've been thinking about the same thing from time to time, and I'd rather select I2C, SPI and BACKLIGHT_CLASS_DEVICE than use depend. But, for example, using select to BACKLIGHT_CLASS_DEVICE is broken: if I change a panel driver to select BACKLIGHT_CLASS_DEVICE, but then I manually disable CONFIG_BACKLIGHT_LCD_SUPPORT (which the BACKLIGHT_CLASS_DEVICE depends on) from the kernel config, this leads to BACKLIGHT_CLASS_DEVICE being enabled, but CONFIG_BACKLIGHT_LCD_SUPPORT being disabled, which is clearly broken. Yes, as far as I understand the problem here is that we don't have any mechanism to handle transitive dependencies (probably because we don't want it). So if one wants to do select something I think the right way to do it would be to inherit all its select/depend statements in the option. So... As I see it, depending is a bit awkward, but it's correct. Yes, it certainly is correct. Best regards, Florian Tobias Schandinat -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/2] OMAPDSS: small fixes for 3.3 rc
On 02/29/2012 08:48 AM, Tomi Valkeinen wrote: Hi, Two small fixes for omapdss. Applied both. Thanks, Florian Tobias Schandinat Florian, if the patches are ok, I guess it's easier if you just apply these patches from email, instead of me sending a pull request? Tomi Tomi Valkeinen (2): OMAPDSS: panel-dvi: Add Kconfig dependency on I2C OMAPDSS: APPLY: make ovl_enable/disable synchronous drivers/video/omap2/displays/Kconfig |2 +- drivers/video/omap2/dss/apply.c |6 ++ 2 files changed, 7 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS fixes for 3.3-rc
On 02/23/2012 09:22 AM, Tomi Valkeinen wrote: Hi Florian, Two fixes for OMAP DSS for 3.3: First one gets the HDMI output working again. Managing the clocks for OMAP4 is not very simple, and this patch circumvents the problems we have in the clock framework. It's a clean but rather hacky fix, but it shouldn't cause any side-effects. The issue will hopefully be fixed properly with DT when we'll get proper parent-child hierarchy for DSS HW submodules. The second one is a simple fix for HDMI hotplug detection, which I missed when I wrote the HDMI PHY fix (c49d005b6cc8491fad5b24f82805be2d6bcbd3dd). Merged. You would add Cc: sta...@vger.kernel.org to patches if appropriate? Thanks, Florian Tobias Schandinat Tomi The following changes since commit d65b4e98d7ea3038b767b70fe8be959b2913f16d: Linux 3.3-rc3 (2012-02-08 19:21:53 -0800) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-3.3-rc Archit Taneja (1): OMAPDSS: HACK: Ensure DSS clock domain gets out of idle when HDMI is enabled Rob Clark (1): OMAPDSS: HDMI: hot plug detect fix drivers/video/omap2/dss/hdmi.c| 24 +++- drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c |9 + 2 files changed, 24 insertions(+), 9 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 00/16] rmk's patch series for fixing OMAP
Hi Russell, On 02/08/2012 04:35 PM, Russell King - ARM Linux wrote: commit c49d005b6cc8491fad5b24f82805be2d6bcbd3dd Author: Tomi Valkeinen tomi.valkei...@ti.com Date: Tue Jan 17 11:09:57 2012 +0200 OMAPDSS: HDMI: PHY burnout fix A hardware bug in the OMAP4 HDMI PHY causes physical damage to the board if the HDMI PHY is kept powered on when the cable is not connected. I agree this is a serious issue. which now has me wondering if, by trying to boot v3.3-rc2 on this board during the past week, I have a destroyed HDMI interface on it. I am not sure as I don't keep track of all OMAP changes, but you make it sound like a regression, is there any difference to 3.2 behavior? So, a big thanks for sitting on that fix and exposing peoples hardware to damage, that shows real professionalism. Well, I am no professional to begin with, at least in the sense of getting paid for it. That said I'm quite happy if I manage to find a few hours every weekend to do the work. Given that the final thing should be tested in -next before I ask Linus to pull, it is completely usual (and even quite fast) if things take 8-13 days on my end. If this isn't fast enough for Tomi, he'd better ask Linus to pull directly for such issues. This one was also somewhat special as I had to learn how to deal with PGP and signed tags to make Linus happy. Best regards, Florian Tobias Schandinat -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS fixes for 3.3-rc
Hi Tomi, On 01/26/2012 12:07 PM, Tomi Valkeinen wrote: Hi Florian, Here are two major fixes for OMAP DSS driver. The first (OMAPDSS: use sync versions...) fixes problem with system suspend, which causes omapdss power management to give WARNs and generally malfunction on system suspend/resume. The second (the rest of the patches) implements a workaround for HW bug, which causes physical damage to the board if the HDMI cable is disconnected at a wrong time. The actual fix is in the last patch, but the board files needed some cleanups and a new GPIO, which is what the smaller patches do. The branch is based on fbdev/fbdev-next. Is that ok? Yes, that worked well, as I didn't start to collect 3.4 material there. Merged. Thanks, Florian Tobias Schandinat Tomi The following changes since commit f787f32e67e00b072f46b2ae3c454d2c0a1fcdb7: module_param: make bool parameters really bool (drivers/video/i810) (2012-01-12 23:28:59 +) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-3.3-rc Tomi Valkeinen (7): OMAPDSS: use sync versions of pm_runtime_put OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD OMAPDSS: remove wrong HDMI HPD muxing OMAP: 4430SDP/Panda: setup HDMI GPIO muxes OMAP: 4430SDP/Panda: add HDMI HPD gpio OMAPDSS: HDMI: PHY burnout fix arch/arm/mach-omap2/board-4430sdp.c | 18 ++-- arch/arm/mach-omap2/board-omap4panda.c| 18 ++-- arch/arm/mach-omap2/display.c |4 -- drivers/video/omap2/dss/dispc.c |2 +- drivers/video/omap2/dss/dsi.c |2 +- drivers/video/omap2/dss/dss.c |2 +- drivers/video/omap2/dss/hdmi.c|5 ++- drivers/video/omap2/dss/rfbi.c|2 +- drivers/video/omap2/dss/ti_hdmi.h |4 ++ drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 68 +++-- drivers/video/omap2/dss/venc.c|2 +- include/video/omapdss.h |5 ++ 12 files changed, 110 insertions(+), 22 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] video: convert drivers/video/* to use module_spi_driver()
On 01/27/2012 08:02 AM, Axel Lin wrote: This patch converts the drivers in drivers/video/* to use the module_spi_driver() macro which makes the code smaller and a bit simpler. Signed-off-by: Axel Lin axel@gmail.com Cc: Imre Deak imre.d...@nokia.com Cc: Roger Quadros roger.quad...@nokia.com Cc: Steve Sakoman st...@sakoman.com Cc: Erik Gilling konk...@android.com Cc: Gražvydas Ignotas nota...@gmail.com Applied. Thanks, Florian Tobias Schandinat --- drivers/video/omap/lcd_mipid.c | 14 +- drivers/video/omap2/displays/panel-acx565akm.c | 13 + .../omap2/displays/panel-lgphilips-lb035q02.c | 12 +--- .../omap2/displays/panel-nec-nl8048hl11-01b.c | 12 +--- .../video/omap2/displays/panel-tpo-td043mtea1.c| 13 + 5 files changed, 5 insertions(+), 59 deletions(-) diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index 8d546dd..e3880c4 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c @@ -609,19 +609,7 @@ static struct spi_driver mipid_spi_driver = { .remove = __devexit_p(mipid_spi_remove), }; -static int __init mipid_drv_init(void) -{ - spi_register_driver(mipid_spi_driver); - - return 0; -} -module_init(mipid_drv_init); - -static void __exit mipid_drv_cleanup(void) -{ - spi_unregister_driver(mipid_spi_driver); -} -module_exit(mipid_drv_cleanup); +module_spi_driver(mipid_spi_driver); MODULE_DESCRIPTION(MIPI display driver); MODULE_LICENSE(GPL); diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c index 51a87e1..d26f37a 100644 --- a/drivers/video/omap2/displays/panel-acx565akm.c +++ b/drivers/video/omap2/displays/panel-acx565akm.c @@ -809,18 +809,7 @@ static struct spi_driver acx565akm_spi_driver = { .remove = __devexit_p(acx565akm_spi_remove), }; -static int __init acx565akm_init(void) -{ - return spi_register_driver(acx565akm_spi_driver); -} - -static void __exit acx565akm_exit(void) -{ - spi_unregister_driver(acx565akm_spi_driver); -} - -module_init(acx565akm_init); -module_exit(acx565akm_exit); +module_spi_driver(acx565akm_spi_driver); MODULE_AUTHOR(Nokia Corporation); MODULE_DESCRIPTION(acx565akm LCD Driver); diff --git a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c index e0eb35b..0841cc2 100644 --- a/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c +++ b/drivers/video/omap2/displays/panel-lgphilips-lb035q02.c @@ -264,16 +264,6 @@ static struct spi_driver lb035q02_spi_driver = { .remove = __devexit_p(lb035q02_panel_spi_remove), }; -static int __init lb035q02_panel_drv_init(void) -{ - return spi_register_driver(lb035q02_spi_driver); -} - -static void __exit lb035q02_panel_drv_exit(void) -{ - spi_unregister_driver(lb035q02_spi_driver); -} +module_spi_driver(lb035q02_spi_driver); -module_init(lb035q02_panel_drv_init); -module_exit(lb035q02_panel_drv_exit); MODULE_LICENSE(GPL); diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c index 0eb31ca..8b38b39 100644 --- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c +++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c @@ -350,18 +350,8 @@ static struct spi_driver nec_8048_spi_driver = { }, }; -static int __init nec_8048_lcd_init(void) -{ - return spi_register_driver(nec_8048_spi_driver); -} - -static void __exit nec_8048_lcd_exit(void) -{ - return spi_unregister_driver(nec_8048_spi_driver); -} +module_spi_driver(nec_8048_spi_driver); -module_init(nec_8048_lcd_init); -module_exit(nec_8048_lcd_exit); MODULE_AUTHOR(Erik Gilling konk...@android.com); MODULE_DESCRIPTION(NEC-nl8048hl11-01b Driver); MODULE_LICENSE(GPL); diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c index e6649aa..1d6b7fb 100644 --- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c +++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c @@ -518,18 +518,7 @@ static struct spi_driver tpo_td043_spi_driver = { .remove = __devexit_p(tpo_td043_spi_remove), }; -static int __init tpo_td043_init(void) -{ - return spi_register_driver(tpo_td043_spi_driver); -} - -static void __exit tpo_td043_exit(void) -{ - spi_unregister_driver(tpo_td043_spi_driver); -} - -module_init(tpo_td043_init); -module_exit(tpo_td043_exit); +module_spi_driver(tpo_td043_spi_driver); MODULE_AUTHOR(Gražvydas Ignotas nota...@gmail.com); MODULE_DESCRIPTION(TPO TD043MTEA1 LCD Driver); -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info
Re: [GIT PULL] OMAP DSS for v3.3
Hi Tomi, On 01/05/2012 08:56 AM, Tomi Valkeinen wrote: Hi Florian, Here are changes to OMAP display subsystem driver for the merge window. This merges and works fine with v3.2, and also merges fine with linux-next. I haven't been able to test with linux-next as there seems to be other brokenness there. Pulled. I hope the problem with linux-next will be resolved before the final kernel is released. Thanks, Florian Tobias Schandinat Tomi The following changes since commit 5611cc4572e889b62a7b4c72a413536bf6a9c416: Linux 3.2-rc4 (2011-12-01 14:56:01 -0800) are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-florian Archit Taneja (3): OMAPDSS: DSI: Fix HSDIV related PLL info in dsi_dump_clocks() OMAPDSS: Panel NEC: Set omap_dss_device states correctly OMAPDSS: Displays: Make PICODLP driver depend on DPI Axel Lin (2): video: omap: Staticise non-exported symbols video: omap: convert drivers/video/omap/* to use module_platform_driver() Chandrabhanu Mahapatra (2): OMAPDSS: DISPC: Update Fir Coefficients OMAPDSS: DISPC: Update Scaling Clock Logic Daniel Mack (1): OMAP: DSS2: Support for UMSH-8173MD TFT panel Ilya Yanok (2): OMAPDSS: add FocalTech ETM070003DH6 display support OMAPDSS: add OrtusTech COM43H4M10XTC display support Mythri P K (2): OMAPDSS: HDMI: Move duplicate code from boardfile OMAPDSS: HDMI: Disable DDC internal pull up Ricardo Neri (4): ASoC: OMAP: HDMI: Introduce driver data for audio codec ASoC: OMAP: HDMI: Correct signature of ASoC functions OMAPDSS: HDMI: Create function to enable HDMI audio ASoC: OMAP: HDMI: Move HDMI codec trigger function to generic HDMI driver Rob Clark (2): OMAPDSS: fix potential NULL pointer ref in OCP_ERR handling path OMAPDSS: APPLY: fix NULL pointer deref when mgr is not set Tomi Valkeinen (90): OMAPDSS: DSI: flush posted write when entering ULPS OMAPDSS: DSI: flush posted write in send_bta OMAPDSS: DISPC: Flush posted writes when enabling outputs OMAPDSS: DSI: count with number of lanes OMAPDSS: DSI: Parse lane config OMAPDSS: DSI: Use new lane config in dsi_set_lane_config OMAPDSS: DSI: use lane config in dsi_get_lane_mask OMAPDSS: DSI: use lane config in dsi_cio_wait_tx_clk_esc_reset OMAPDSS: DSI: use lane config in dsi_cio_enable_lane_override OMAPDSS: DSI: remove dsi_get_num_lanes_used OMAPDSS: DSI: fix lane handling when entering ULPS OMAPDSS: DSI: improve wait_for_bit_change OMAPDSS: DSI: disable DDR_CLK_ALWAYS_ON when entering ULPS OMAPDSS: DISPC: add missing prototype OMAPDSS: Remove old fifomerge hacks OMAPDSS: remove L4_EXAMPLE code OMAPDSS: DISPC: make dispc_ovl_set_channel_out() public OMAPDSS: DISPC: make dispc_ovl_set_fifo_threshold() public OMAPDSS: remove partial update from the overlay manager OMAPDSS: remove partial update from DSI OMAPDSS: remove partial update from panel-taal OMAPDSS: pass ovl manager to dss_start_update OMAPDSS: DISPC: handle 0 out_width/out_height in ovl_setup() OMAPDSS: handle ilace/replication when configuring overlay OMAPDSS: separate FIFO threshold setup from ovl_setup OMAPDSS: separate overlay channel from ovl_setup OMAPDSS: setup manager with dispc_mgr_setup() OMAPDSS: DISPC: remove unused functions OMAPDSS: remove unneeded dss_ovl_wait_for_go() OMAPDSS: add ovl/mgr_manual_update() helpers OMAPDSS: split omap_dss_mgr_apply() to smaller funcs OMAPDSS: apply affects only one overlay manager OMAPDSS: create apply.c OMAPDSS: hide manager's enable/disable() OMAPDSS: APPLY: track whether a manager is enabled OMAPDSS: APPLY: skip isr register and config for manual update displays OMAPDSS: APPLY: skip isr register and config for disabled displays OMAPDSS: APPLY: cleanup dss_mgr_start_update OMAPDSS: store overlays in an array OMAPDSS: store managers in an array OMAPDSS: store overlays in a list for each manager OMAPDSS: APPLY: separate vsync isr register/unregister OMAPDSS: DISPC: Add dispc_mgr_get_vsync_irq() OMAPDSS: APPLY: use dispc_mgr_get_vsync_irq() OMAPDSS: APPLY: configure_* funcs take ovl/manager as args OMAPDSS: APPLY: rename overlay_cache_data OMAPDSS: APPLY: rename manager_cache_data OMAPDSS: APPLY: move spinlock outside the struct OMAPDSS: APPLY: rename dss_cache to dss_data OMAPDSS: APPLY: move ovl funcs to apply.c OMAPDSS: APPLY: move mgr funcs to apply.c OMAPDSS: remove ovl/mgr check-code temporarily OMAPDSS: APPLY: add mutex OMAPDSS: APPLY: add missing uses of spinlock OMAPDSS: DSI: call mgr_enable/disable for cmd
Re: [PATCH 09/11] video: Remove redundant spi driver bus initialization
On 11/24/2011 03:29 PM, Lars-Peter Clausen wrote: In ancient times it was necessary to manually initialize the bus field of an spi_driver to spi_bus_type. These days this is done in spi_driver_register(), so we can drop the manual assignment. The patch was generated using the following coccinelle semantic patch: // smpl @@ identifier _driver; @@ struct spi_driver _driver = { .driver = { - .bus = spi_bus_type, }, }; // /smpl Signed-off-by: Lars-Peter Clausen l...@metafoo.de Cc: Tomi Valkeinen tomi.valkei...@ti.com Cc: Florian Tobias Schandinat florianschandi...@gmx.de Cc: linux-fb...@vger.kernel.org Cc: linux-omap@vger.kernel.org Applied this patch. Thanks, Florian Tobias Schandinat --- drivers/video/omap/lcd_mipid.c |1 - drivers/video/omap2/displays/panel-acx565akm.c |1 - drivers/video/omap2/displays/panel-n8x0.c |1 - .../omap2/displays/panel-nec-nl8048hl11-01b.c |1 - .../video/omap2/displays/panel-tpo-td043mtea1.c|1 - 5 files changed, 0 insertions(+), 5 deletions(-) diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index eb381db..8d546dd 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c @@ -603,7 +603,6 @@ static int mipid_spi_remove(struct spi_device *spi) static struct spi_driver mipid_spi_driver = { .driver = { .name = MIPID_MODULE_NAME, - .bus= spi_bus_type, .owner = THIS_MODULE, }, .probe = mipid_spi_probe, diff --git a/drivers/video/omap2/displays/panel-acx565akm.c b/drivers/video/omap2/displays/panel-acx565akm.c index dbd59b8..51a87e1 100644 --- a/drivers/video/omap2/displays/panel-acx565akm.c +++ b/drivers/video/omap2/displays/panel-acx565akm.c @@ -803,7 +803,6 @@ static int acx565akm_spi_remove(struct spi_device *spi) static struct spi_driver acx565akm_spi_driver = { .driver = { .name = acx565akm, - .bus= spi_bus_type, .owner = THIS_MODULE, }, .probe = acx565akm_spi_probe, diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c index 150e8ba..dc9408d 100644 --- a/drivers/video/omap2/displays/panel-n8x0.c +++ b/drivers/video/omap2/displays/panel-n8x0.c @@ -708,7 +708,6 @@ static int mipid_spi_remove(struct spi_device *spi) static struct spi_driver mipid_spi_driver = { .driver = { .name = lcd_mipid, - .bus= spi_bus_type, .owner = THIS_MODULE, }, .probe = mipid_spi_probe, diff --git a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c index 2ba9d0c..8365e77 100644 --- a/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c +++ b/drivers/video/omap2/displays/panel-nec-nl8048hl11-01b.c @@ -303,7 +303,6 @@ static struct spi_driver nec_8048_spi_driver = { .resume = nec_8048_spi_resume, .driver = { .name = nec_8048_spi, - .bus= spi_bus_type, .owner = THIS_MODULE, }, }; diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c index 2462b9e..e6649aa 100644 --- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c +++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c @@ -512,7 +512,6 @@ static int __devexit tpo_td043_spi_remove(struct spi_device *spi) static struct spi_driver tpo_td043_spi_driver = { .driver = { .name = tpo_td043mtea1_panel_spi, - .bus= spi_bus_type, .owner = THIS_MODULE, }, .probe = tpo_td043_spi_probe, -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [GIT PULL] OMAP DSS fixes for 3.2-rc
Hi Tomi, On 11/18/2011 08:16 AM, Tomi Valkeinen wrote: Hi Florian, Here are a few OMAP display subsystem fixes for 3.2-rc. One for the old omapfb, which was missing include module.h, and two for the omapdss fixing issues related to HDMI. Pulled, but... The following changes since commit cfcfc9eca2bcbd26a8e206baeb005b055dbf8e37: Linux 3.2-rc2 (2011-11-15 15:02:59 -0200) ...could you please try to base on something that is already in my tree, perhaps just add patches on top of the last pull request you sent me. If you need something more recent, that is okay, but don't force me to needlessly update my tree. Thanks, Florian Tobias Schandinat are available in the git repository at: git://gitorious.org/linux-omap-dss2/linux.git for-3.2-rc Tomi Valkeinen (3): OMAPDSS: HDMI: fix returned HDMI pixel clock OMAPFB: fix compilation warnings due to missing include OMAPDSS: DISPC: skip scaling calculations when not scaling drivers/video/omap/dispc.c |1 + drivers/video/omap2/dss/dispc.c | 11 +-- drivers/video/omap2/dss/hdmi.c |2 +- 3 files changed, 7 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 49/55] video: irq: Remove IRQF_DISABLED
On 09/22/2011 08:59 AM, Yong Zhang wrote: Since commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled], We run all interrupt handlers with interrupts disabled and we even check and yell when an interrupt handler returns with interrupts enabled (see commit [b738a50a: genirq: Warn when handler enables interrupts]). So now this flag is a NOOP and can be removed. Signed-off-by: Yong Zhang yong.zha...@gmail.com Acked-by: David Brown dav...@codeaurora.org Applied. Thanks, Florian Tobias Schandinat --- drivers/video/au1200fb.c |2 +- drivers/video/bf54x-lq043fb.c |2 +- drivers/video/bfin-lq035q1-fb.c |2 +- drivers/video/bfin-t350mcqb-fb.c |2 +- drivers/video/bfin_adv7393fb.c|2 +- drivers/video/mb862xx/mb862xxfbdrv.c |4 ++-- drivers/video/msm/mddi.c |2 +- drivers/video/msm/mdp.c |2 +- drivers/video/nuc900fb.c |2 +- drivers/video/omap2/displays/panel-taal.c |2 +- drivers/video/ps3fb.c |2 +- drivers/video/pxa3xx-gcu.c|2 +- drivers/video/pxafb.c |2 +- drivers/video/s3c2410fb.c |2 +- drivers/video/sa1100fb.c |3 +-- drivers/video/sh_mobile_lcdcfb.c |2 +- drivers/video/tmiofb.c|2 +- drivers/video/vt8500lcdfb.c |2 +- 18 files changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index a19a40e..7200559 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c @@ -1673,7 +1673,7 @@ static int __devinit au1200fb_drv_probe(struct platform_device *dev) /* Now hook interrupt too */ irq = platform_get_irq(dev, 0); ret = request_irq(irq, au1200fb_handle_irq, - IRQF_DISABLED | IRQF_SHARED, lcd, (void *)dev); + IRQF_SHARED, lcd, (void *)dev); if (ret) { print_err(fail to request interrupt line %d (err: %d), irq, ret); diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c index 2464b91..56720fb 100644 --- a/drivers/video/bf54x-lq043fb.c +++ b/drivers/video/bf54x-lq043fb.c @@ -633,7 +633,7 @@ static int __devinit bfin_bf54x_probe(struct platform_device *pdev) goto out7; } - if (request_irq(info-irq, bfin_bf54x_irq_error, IRQF_DISABLED, + if (request_irq(info-irq, bfin_bf54x_irq_error, 0, PPI ERROR, info) 0) { printk(KERN_ERR DRIVER_NAME : unable to request PPI ERROR IRQ\n); diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c index 23b6c4b..c633068 100644 --- a/drivers/video/bfin-lq035q1-fb.c +++ b/drivers/video/bfin-lq035q1-fb.c @@ -695,7 +695,7 @@ static int __devinit bfin_lq035q1_probe(struct platform_device *pdev) goto out7; } - ret = request_irq(info-irq, bfin_lq035q1_irq_error, IRQF_DISABLED, + ret = request_irq(info-irq, bfin_lq035q1_irq_error, 0, DRIVER_NAME PPI ERROR, info); if (ret 0) { dev_err(pdev-dev, unable to request PPI ERROR IRQ\n); diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index d8de29f..d5e1267 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c @@ -529,7 +529,7 @@ static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) goto out7; } - ret = request_irq(info-irq, bfin_t350mcqb_irq_error, IRQF_DISABLED, + ret = request_irq(info-irq, bfin_t350mcqb_irq_error, 0, PPI ERROR, info); if (ret 0) { printk(KERN_ERR DRIVER_NAME diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c index 8486f54..811dd7f 100644 --- a/drivers/video/bfin_adv7393fb.c +++ b/drivers/video/bfin_adv7393fb.c @@ -481,7 +481,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client, goto out_4; } - if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, IRQF_DISABLED, + if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, 0, PPI ERROR, fbdev) 0) { dev_err(client-dev, unable to request PPI ERROR IRQ\n); ret = -EFAULT; diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c index 12a634a..11a7a33 100644 --- a/drivers/video/mb862xx/mb862xxfbdrv.c +++ b/drivers/video/mb862xx/mb862xxfbdrv.c @@ -738,7 +738,7 @@ static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev) if (mb862xx_gdc_init(par)) goto io_unmap; - if (request_irq(par-irq, mb862xx_intr, IRQF_DISABLED
Re: [RFC PATCH] HDMI:Support for EDID parsing in kernel.
. This is good because it looks like we'll have 3 display subsystems within the kernel for a long future and with a common library the same patch would not need to be done 3 times but only once. Or even more often if drivers have there private EDID implementation which I just throw out of mine to replace it later with a common one. Regards, Florian Tobias Schandinat -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Linux-fbdev-devel] [APPLIED] [PATCH] omapfb: Reorder Register_framebuffer call
Jan Blunck schrieb: On Tue, Sep 22, 2009 at 6:57 PM, Aguirre Rodriguez, Sergio Alberto saagui...@ti.com wrote: From: Tony Lindgren [t...@atomide.com] Sent: Tuesday, September 22, 2009 11:28 AM * Jan Blunck jblu...@infradead.org [090922 07:59]: On Tue, Sep 22, 2009 at 3:31 AM, Tony Lindgren t...@atomide.com wrote: This patch has been applied to the linux-omap by youw fwiendly patch wobot. Branch in linux-omap: omap-fixes Initial commit ID (Likely to change): 9aef1066fb5ca8506068eaab1c552ecca4c85475 PatchWorks http://patchwork.kernel.org/patch/47089/ Added back the original Cc's that were dropped from the linux-omap commit message. Is it actually safe to do this? The framebuffer can be used directly after it is registered. In this case it would mean it is used before it is even fully initialized (set_fb_var(), set_fb_fix(), ... are being called). Good point, dropping the patch. Hmm, ok. I guess i'll rework this patch considering that.. I ran some framebuffer tests with this patch applied, and they worked fine for me. The only thing is that i didn't saw Tux on bootup... Actually, nobody ever gave this kind of feedback, which was the initial idea. Sorry, I didn't look into it earlier. BTW, I actually wonder if it's really necessary to initialize the mutex in register_framebuffer() or why it couldn't be done during allocation. This small discussion between Linus and Krzysztof might explain it: http://marc.info/?l=linux-kernelm=124703449332064w=2 or to summarize: It is done the way it is done to keep drivers working that use statically declared fb_info. Although I agree, that it would be cleaner the other way around. Regards, Florian Tobias Schandinat -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [Linux-fbdev-devel] Getting DSS2 to mainline
Hi, Tomi Valkeinen schrieb: Hi, As I'm new to sending patches upstream, I'm not sure how to go forward with DSS2 now. Should I send it to linux-arm-kernel mailing list, or directly to main linux kernel mailing list? Or is there a route through fbdev-devel list for DSS2 to go forward? I am also new to this process but from what I've heard I decided to always cc Andrew Morton a...@linux-foundation.org when I think that something is mature enough for inclusion. That works very well, thanks Andrew. Sending them only to linux-fbdev-devel looks rather like a dead end at least if I look on the fate of some patches in the archive. I always cc the LKML but until now I didn't hear anything from there either so I doubt that would be the right way. I'm sorry if anything of the above is incorrect, it's just my experience. Regards, Florian Tobias Schandinat -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html