| author | Praneeth Bajjuri <praneeth@ti.com> | |
| Sat, 13 Jul 2013 00:34:10 +0000 (19:34 -0500) | ||
| committer | Praneeth Bajjuri <praneeth@ti.com> | |
| Sat, 13 Jul 2013 00:34:10 +0000 (19:34 -0500) | ||
| commit | fd8c1a0f148e9e39cddd6a3ab27525037f01dfc1 | |
| tree | 20767f52122abc4ea5a92ed56619ea8df4d999e3 | tree | snapshot (tar.xz tar.gz zip) |
| parent | e21e07903fcf17375a8e2b61dbfb7bcd7c6d8860 | commit | diff |
| parent | 13545520396589a9330c42d07583feda8aee8ab4 | commit | diff |
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
* p-ti-linux-3.8.y:
arm: dra: Add gpu interface clock
arm: dra7xx: Add gpu hwmod
arm/dts: dra7: Add gpu supply
arm: dts: dra7xx: Add gpu data
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:
arm: dra: Add gpu interface clock
arm: dra7xx: Add gpu hwmod
arm/dts: dra7: Add gpu supply
arm: dts: dra7xx: Add gpu data
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>