litmus-rt.git/include/video, branch wip-nested-locking

Merge branches 'common/fbdev' and 'common/fbdev-meram' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

2011-05-24T06:49:57+00:00

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

2011-05-24T06:35:54+00:00

Conflicts:
	drivers/video/omap2/dss/dsi.c
	drivers/video/omap2/dss/dss_features.c
	drivers/video/omap2/dss/dss_features.h

Signed-off-by: Paul Mundt

sh_mobile_meram: Add support for NV24 framebuffers

2011-05-23T07:06:26+00:00

Since the NV24 framebuffer has a CbCr plane that is twice as wide
as the Y plane, it needs to be handled as a special case.

Signed-off-by: Damian Hobson-Garcia 
Signed-off-by: Paul Mundt

sh_mobile_meram: MERAM framework for LCDC

2011-05-23T07:06:24+00:00

Based on the patch by Takanari Hayama 

Adds support framework necessary to use Media RAM (MERAM)
caching functionality with the LCDC.  The MERAM is accessed
through up to 4 Interconnect Buffers (ICBs).

ICB numbers and MERAM address ranges to use are specified in
by filling in the .meram_cfg member of the LCDC platform data

Signed-off-by: Damian Hobson-Garcia 
Signed-off-by: Paul Mundt

OMAP: DSS2: Add support for NV12 format

2011-05-23T05:29:47+00:00

Add the support for NV12 color format.
Configure base address for UV component of NV12 color format.
Change the way chroma scaling is handled for YUV formats on OMAP4 by enabling
chroma-resampling for video pipeline and hence using FIR2 register set for
scaling UV.
Changes to _dispc_set_scaling(), because of the reason above, are:
- call _dispc_set_scaling_common() to handle scaling for all color formats
  except for OMAP4 where it only handles scaling for RGB or Y-component
- call _dispc_set_scaling_uv() for special handling required for UV
  component on OMAP4.
- dispc_set_scaling_uv() also resets chroma-resampling bit for RGB color modes.

Contains chroma scaling (_dispc_set_scaling_uv) design and implemented by
Lajos Molnar 

Signed-off-by: Amber Jain 
Signed-off-by: Tomi Valkeinen

OMAP: DSS2: Add new color formats for OMAP4

2011-05-23T05:29:47+00:00

Add new color formats supported by OMAP4: NV12, RGBA16, RGBX16,
ARGB16_1555, XRGB16_1555.
NV12 color format is defined here, its support in DSS will be added separately.

Signed-off-by: Amber Jain 
Signed-off-by: Tomi Valkeinen

OMAP: DSS2: DSI: Get number of DSI data lanes using DSI_GNQ register

2011-05-16T10:31:09+00:00

On OMAP3, the DSI module has 2 data lanes. On OMAP4, DSI1 has 4 data lanes
and DSI2 has 2 data lanes. Introduce function dsi_get_num_data_lanes() which
returns the number of data lanes on the dsi interface, introduce function
dsi_get_num_data_lanes_dssdev() which returns the number of data lanes used by
the omap_dss_device connected to the lanes.

Use the DSI_GNQ register on OMAP4 to get the number of data lanes, modify
dsi.c to use the number of lanes and the extra data lanes on DSI1.

Signed-off-by: Archit Taneja 
Signed-off-by: Tomi Valkeinen

OMAP: DSS2: RFBI: add omap_rfbi_configure

2011-05-12T16:39:50+00:00

Add omap_rfbi_configure() which the panel driver can use to reconfigure
the data element size and the number of data lines in the RFBI bus.

Signed-off-by: Tomi Valkeinen

OMAP: DSS2: RFBI: add rfbi_bus_lock

2011-05-12T16:39:49+00:00

Add similar bus lock to RFBI as is in DSI. The panel driver can use the
bus lock to mark that the RFBI bus is currently in use.

Signed-off-by: Tomi Valkeinen

OMAP4: DSS2: DSI: Changes for DSI2 on OMAP4

2011-05-12T16:30:27+00:00

Introduce DSI2 PLL clock sources needed by LCD2 channel and DSI2 Protocol
engine and DISPC Functional clock. Do the following:

- Modify dss_get_dsi_clk_source() and dss_select_dsi_clk_source() to take the
  dsi module number as an argument.
- Create debugfs files for dsi2, split the corresponding debugfs functions.
- Allow DPI to use these new clock sources.

Signed-off-by: Archit Taneja 
Signed-off-by: Tomi Valkeinen