diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 23:43:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 23:43:40 -0400 |
| commit | 437538267b672f9320833907f1b5acbb2605f4be (patch) | |
| tree | d10173b35a5b86bc037bb2ece1b406d5575a2094 /include/video/udlfb.h | |
| parent | 9586c959bfc917695893bef0102433a7d0675691 (diff) | |
| parent | 6bff98b455cf3e666fd0e3d0d908eba874de0eee (diff) | |
Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6
Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
- drivers for Samsung Exynos MIPI DSI and display port
- i740fb to support those old Intel chips
- large updates to OMAP, viafb and sh_mobile_lcdcfb
- some updates to s3c-fb and udlfb, few patches to others
Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.
* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
OMAPDSS: register dss drivers in module init
video: pxafb: add clk_prepare/clk_unprepare calls
fbdev: bfin_adv7393fb: Drop needless include
fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
Revert "MAINTAINERS: add entry for exynos mipi display drivers"
fbdev: da8xx: add support for SP10Q010 display
fbdev: da8xx:: fix reporting of the display timing info
drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
fbdev: sh_mobile_meram: Implement system suspend/resume
fbdev: sh_mobile_meram: Remove unneeded sanity checks
fbdev: sh_mobile_meram: Don't perform update in register operation
arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
fbdev: sh_mobile_lcdc: Don't store copy of platform data
fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
fbdev: sh_mobile_meram: Allocate ICBs automatically
fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
...
Diffstat (limited to 'include/video/udlfb.h')
| -rw-r--r-- | include/video/udlfb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/video/udlfb.h b/include/video/udlfb.h index c41f308c9636..f9466fa54ba4 100644 --- a/include/video/udlfb.h +++ b/include/video/udlfb.h | |||
| @@ -41,6 +41,7 @@ struct dlfb_data { | |||
| 41 | char *backing_buffer; | 41 | char *backing_buffer; |
| 42 | int fb_count; | 42 | int fb_count; |
| 43 | bool virtualized; /* true when physical usb device not present */ | 43 | bool virtualized; /* true when physical usb device not present */ |
| 44 | struct delayed_work init_framebuffer_work; | ||
| 44 | struct delayed_work free_framebuffer_work; | 45 | struct delayed_work free_framebuffer_work; |
| 45 | atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */ | 46 | atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */ |
| 46 | atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */ | 47 | atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */ |