author | Praneeth Bajjuri <praneeth@ti.com> | |
Sat, 13 Jul 2013 00:36:54 +0000 (19:36 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Sat, 13 Jul 2013 00:36:54 +0000 (19:36 -0500) | ||
commit | 9a7cf4f181219a027494b4710ad88f1514f1a27d | |
tree | c4b75184f3b94102ce94332f6e1cf56e69a36a6e | tree | snapshot (tar.xz tar.gz zip) |
parent | fd8c1a0f148e9e39cddd6a3ab27525037f01dfc1 | commit | diff |
parent | 63d5b543195acfbba2286b24c3723c11328d6586 | commit | diff |
Merge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video into p-ti-android-3.8.y
* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video: (103 commits)
HDMI: Add reading edid and mode db creation
HDMI: Select correct clock source.
HDMI: Select DVI or HDMI based on EDID
HDMI: Add fb mode db construction
HDMI: Add edid read and clear functions
HDMI: Add FB mode database setting support
OMAPDSS: HDMI: Add setmode support for android
OMAP: HDMI : Add initial support for fb mode translation
OMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D
OMAPDSS: OMAPLFB: VRAM buffers for second FB.
gpu: OMAP2: generic Android display configuration setup
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
gpu: android-display: DO NOT MERGE: android display compilation fixes
gc320: OMAP4:GCXXX: Fixing build warnings
OMAPDSS: OMAPLFB: Fix compilation issue for tiler path
gpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed
gpu: omap_hwc: Describe the api agreement with omaplfb
gc320: Add header for dsscomp and optional bltsville data from Android HWC
gc320: Initial Open Color format Definitions (OCD).
gc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
* 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video: (103 commits)
HDMI: Add reading edid and mode db creation
HDMI: Select correct clock source.
HDMI: Select DVI or HDMI based on EDID
HDMI: Add fb mode db construction
HDMI: Add edid read and clear functions
HDMI: Add FB mode database setting support
OMAPDSS: HDMI: Add setmode support for android
OMAP: HDMI : Add initial support for fb mode translation
OMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D
OMAPDSS: OMAPLFB: VRAM buffers for second FB.
gpu: OMAP2: generic Android display configuration setup
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
gpu: android-display: DO NOT MERGE: android display compilation fixes
gc320: OMAP4:GCXXX: Fixing build warnings
OMAPDSS: OMAPLFB: Fix compilation issue for tiler path
gpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed
gpu: omap_hwc: Describe the api agreement with omaplfb
gc320: Add header for dsscomp and optional bltsville data from Android HWC
gc320: Initial Open Color format Definitions (OCD).
gc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files
...
Conflicts:
arch/arm/boot/dts/dra7-evm.dts
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
arch/arm/boot/dts/dra7-evm.dts | diff1 | | diff2 | | blob | history |