| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Fri, 12 Jul 2013 21:55:37 +0000 (16:55 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Fri, 12 Jul 2013 21:55:37 +0000 (16:55 -0500) | ||
| commit | ab72ca07980960a607b5abe8cb4b5445eb0897ed | |
| tree | dfce1c8d56d8e30a2a3ba889938c6e39e199bb7b | tree | snapshot (tar.xz tar.gz zip) |
| parent | e21e07903fcf17375a8e2b61dbfb7bcd7c6d8860 | commit | diff |
| parent | 93f10742831f9ddb005142a2105befaf585215a4 | commit | diff |
Merge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video
* p-ti-linux-3.8.y-video:
OMAPDSS: DISPC: Force L3_2 CD to NOSLEEP when dispc module is active
OMAPDSS: DSS: Fix for mask query in manager blank api
OMAPDSS: DSS: Fix for setting up the overlay channel
OMAPDSS: DSS: fix for zorder checking logic
OMAPDSS: DSS: Fix for DSS num_managers check in callbacks
OMAPDSS: DSS: Fix for DSS manager IRQ mask ordering
OMAPDSS: DSS: Enable dsscomp callbacks from apply IRQ
OMAPDSS: DSS: Add callback for tracking overlay/manager changes
OMAPDSS: DSS: Fix null pointer crash in DSS
OMAPDSS: DSS: Initialize manager blank api.
OMAPDSS: DISPC: errata i740 fix: force L3_1 CD to NOSLEEP when dispc module is active
OMAPDSS: DSS: Invoke dsscomp callbacks for manually updated displays
OMAPDSS: DSS: Add support for simultaneous multiple overlay updates
OMAPDSS: DSS: Added Callback functionality to DSS
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* p-ti-linux-3.8.y-video:
OMAPDSS: DISPC: Force L3_2 CD to NOSLEEP when dispc module is active
OMAPDSS: DSS: Fix for mask query in manager blank api
OMAPDSS: DSS: Fix for setting up the overlay channel
OMAPDSS: DSS: fix for zorder checking logic
OMAPDSS: DSS: Fix for DSS num_managers check in callbacks
OMAPDSS: DSS: Fix for DSS manager IRQ mask ordering
OMAPDSS: DSS: Enable dsscomp callbacks from apply IRQ
OMAPDSS: DSS: Add callback for tracking overlay/manager changes
OMAPDSS: DSS: Fix null pointer crash in DSS
OMAPDSS: DSS: Initialize manager blank api.
OMAPDSS: DISPC: errata i740 fix: force L3_1 CD to NOSLEEP when dispc module is active
OMAPDSS: DSS: Invoke dsscomp callbacks for manually updated displays
OMAPDSS: DSS: Add support for simultaneous multiple overlay updates
OMAPDSS: DSS: Added Callback functionality to DSS
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>