android-sdk/kernel-video.git
9 years agoMerge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video
Praneeth Bajjuri [Fri, 26 Jul 2013 01:52:18 +0000 (20:52 -0500)]
Merge remote-tracking branch 'origin/omaplfb' into p-ti-android-3.8.y-video

This contains GC320 series

* origin/omaplfb:
  ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
  gc320: gcx: [WA] Allocate MMU page tables as non cached
  gc320: Added  missing programming of MTLB base second time
  gc320: Increase VRAM buffers to 4
  gc320: adding gcxxx support in Makefiles
  gc320: Adapt GC320 driver for K3.8
  devices: Initialize GC320 as part of devices init
  platform_data: Added platform data for GC320
  gc320: OMAP4: Adding cache-2dmanager

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags
Sundar Raman [Thu, 18 Jul 2013 22:42:14 +0000 (17:42 -0500)]
ARM: OMAP5/DRA7: hwmod: add ADDR_TYPE_RT to bb2d address flags

This is required so that the omap_hwmod_get_mpu_rt_va()
api returns a virtual register base address for the IP.

Change-Id: I29aff07f34653c552b3eac3a1ac3f10e36b7efbb
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: gcx: [WA] Allocate MMU page tables as non cached
Sundar Raman [Mon, 22 Jul 2013 14:25:56 +0000 (09:25 -0500)]
gc320: gcx: [WA] Allocate MMU page tables as non cached

In K3.8, the cache flushing APIs for the MMU page tables are not
working correctly. Changed the allocations to non cached to
workaround the problem until the correct root cause is found.

Change-Id: Id87497b86d3d93941926f4fc417a4f8d81a5d570
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: Added missing programming of MTLB base second time
Alexei Shlychkov [Mon, 22 Jul 2013 14:29:06 +0000 (09:29 -0500)]
gc320: Added  missing programming of MTLB base second time

This patch fixes a crash when running the bvtest test case
second time around. The MTLB base address was not programmed
second time around leading to a bad MMU state. This patch
ensures that the MTLB base is programmed correctly.

Change-Id: Iab33425bc61c1e1618c78bdb17f64cbb9d7b4309
Signed-off-by: Alexei Shlychkov <shlychkov@gmail.com>
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: Increase VRAM buffers to 4
Sundar Raman [Thu, 18 Jul 2013 22:49:53 +0000 (17:49 -0500)]
gc320: Increase VRAM buffers to 4

With GC320 driver integrated and LCD/HDMI output using VRAM buffers
for SGX composition, it is necessary to increase the number of VRAM
buffers to 4 inorder to allow GC320 to use 2 buffers for composition
output.

Change-Id: I2a481ab9c5c16cd26ac5635b543f41e8c5929fdf
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: adding gcxxx support in Makefiles
David Sin [Mon, 28 Jan 2013 16:50:54 +0000 (18:50 +0200)]
gc320: adding gcxxx support in Makefiles

Ported from k3.0, commit Id 6c14dfc5c011ce3
[ David Sin <davidsin@ti.com> ]

Change-Id: Ie3b211ff273c9257b596560b6260058466152b35
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogc320: Adapt GC320 driver for K3.8
Sundar Raman [Thu, 18 Jul 2013 22:40:57 +0000 (17:40 -0500)]
gc320: Adapt GC320 driver for K3.8

Modified SOC checks and a few other minor changes.

Change-Id: I426c2f017bea0384c7602dd50c0b558329d79b1a
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agodevices: Initialize GC320 as part of devices init
Sundar Raman [Thu, 18 Jul 2013 22:37:40 +0000 (17:37 -0500)]
devices: Initialize GC320 as part of devices init

With K3.8, devices.c is used to initialize platform
devices. Added GC320 initialization here so that it is
done as part of bootup.

Change-Id: I45d3e3b18fb4b419f7a5aabfa7cea54460ffe46a
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agoplatform_data: Added platform data for GC320
Sundar Raman [Thu, 18 Jul 2013 22:36:29 +0000 (17:36 -0500)]
platform_data: Added platform data for GC320

The omap_gcx.h file which contains platform specific
structures for gc320 IP is being added as part of this
patch

Change-Id: I4889333139bb8cd3724ec99ad3e108952e585ed1
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: OMAP4: Adding cache-2dmanager
Jack Yen [Mon, 24 Dec 2012 12:59:51 +0000 (14:59 +0200)]
gc320: OMAP4: Adding cache-2dmanager

Based on k3.0 commit:
p-android-omap-3.0: 43eb373199a [Jack Yen <jyen@ti.com>]

Change-Id: I7e43de75a20a1cead49e902a7fedad9d4f568855
Signed-off-by: Jack Yen <jyen@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agoMerge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-andro...
Sundar Raman [Fri, 19 Jul 2013 18:36:50 +0000 (13:36 -0500)]
Merge remote-tracking branch 'remotes/gitomapzoom/p-ti-android-3.8.y' into p-ti-android-3.8.y-video

9 years agoandroid: defconfig: OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for...
Praneeth Bajjuri [Thu, 18 Jul 2013 00:05:39 +0000 (19:05 -0500)]
android: defconfig: OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature

Enabling dual FB configuration for multidisplay feature

updating CMDLINE for omapfb accordingly

Change-Id: I1d503cd8dfd955a3eb60871ca03eec2dc1a52560
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoandroid: defconfig: usb: Enable all usb drivers as built in.
Ruchika Kharwar [Wed, 10 Jul 2013 04:01:01 +0000 (23:01 -0500)]
android: defconfig: usb: Enable all usb drivers as built in.

DWC3, XHCI, PHY and OMAP_CONTROL are all set to be built-in vs modules.

Change-Id: I5e2c3dd4a10f7bda0a981eb44465c594d2bc2002
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Wed, 17 Jul 2013 22:54:50 +0000 (17:54 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  omap5: device tree: usb: Specify optional clock names in dt
  usb: phy: protect against NULL phy pointers
  usb: dwc3: core: make USB3 PHY optional
  usb: dwc3: adapt to use dr_mode device tree helper
  usb: dwc3: make maximum-speed a per-instance attribute
  usb: common: introduce of_usb_get_maximum_speed()
  usb: add devicetree helpers for determining dr_mode and phy_type
  dra7xx : usb3_phy: Updated dpll M,N values.
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

Change-Id: I94360aac84a025cf25ef7220c16110e146918029
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoomap5: device tree: usb: Specify optional clock names in dt
Ruchika Kharwar [Wed, 10 Jul 2013 04:01:01 +0000 (23:01 -0500)]
omap5: device tree: usb: Specify optional clock names in dt

Specify the optional clock names in the device tree.
This is required for scalablity.

Change-Id: Id80d0c0c92d1bb676f1fc713a20f668e3b0ee161
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agousb: phy: protect against NULL phy pointers
Felipe Balbi [Sat, 6 Jul 2013 13:01:17 +0000 (08:01 -0500)]
usb: phy: protect against NULL phy pointers

In order to decrease the amount of work done
by PHY users, allow NULL phy pointers to be
passed.
[Backport from 3.10 patch http://www.spinics.net/lists/linux-usb/msg88622.html
- Ignored what could not be applied for 3.8
]
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
Change-Id: Ic921172d92214a4d0f8c840b6869beb7d320ff4a

9 years agousb: dwc3: core: make USB3 PHY optional
Felipe Balbi [Wed, 10 Jul 2013 19:00:34 +0000 (14:00 -0500)]
usb: dwc3: core: make USB3 PHY optional

If we want a port to work at any speed lower than Superspeed, it makes no
sense to even initialize/power up the USB3 transceiver, provided it won't
be used. We can use the oportunity to save some power and leave the
superspeed transceiver powered off. There is at least one such case which
is Texas Instruments' AM437x which has one of its USB3 ports without a matching
USB3 PHY (that port is hardwired to work on USB2 only).

http://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/
?h=testing&id=d7e39d414310e098540605be2051d5187797be34

Change-Id: I61639c4d58aac671a5aade67814981dc6d20f2e6
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agousb: dwc3: adapt to use dr_mode device tree helper
Ruchika Kharwar [Sat, 6 Jul 2013 12:04:05 +0000 (07:04 -0500)]
usb: dwc3: adapt to use dr_mode device tree helper

This patch adapts the dwc3 to use the device tree helper
"of_usb_get_dr_mode" for the mode of operation of the dwc3 instance
being probed.

Change-Id: Ic2c0fb31b23fda1acdda4269b1d09c5eec626417
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agousb: dwc3: make maximum-speed a per-instance attribute
Felipe Balbi [Sat, 6 Jul 2013 11:12:01 +0000 (06:12 -0500)]
usb: dwc3: make maximum-speed a per-instance attribute

in order to allow different instances of the
core work in different maximum speeds, we will
move the maximum_speed module_parameter to
both DeviceTree (making use the new maximum-speed
DT property) and platform_data.

[Backport from http://permalink.gmane.org/gmane.linux.usb.general/89128
. K3.8 does not have the concept of platform_data
for dwc3, hence maximum_speed belongs to the dwc structure for this kernel]

Change-Id: Ia1e69440a6c91da7e19ac8e7197dd0d492cfcb29
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agousb: common: introduce of_usb_get_maximum_speed()
Felipe Balbi [Sat, 6 Jul 2013 10:59:18 +0000 (05:59 -0500)]
usb: common: introduce of_usb_get_maximum_speed()

this helper will be used for controllers which
want to work at a lower speed even though they
support higher USB transfer rates.

One such case is Texas Instruments' AM437x
SoC where it uses a USB3 controller without
a USB3 PHY, rendering the controller USB2-only.

[backport from
http://www.mail-archive.com/linux-usb@vger.kernel.org/msg23583.html
 - Added in the entry to the bindings dwc3.txt file
 - fixed inconsistent names between dwc3.txt and the code
 - fixed a bug in the speed table "WIRELESS", else there is a runtime error.
]

Change-Id: I9b912e8fb50e470d7e3befdaf41ea65ad750811a
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agousb: add devicetree helpers for determining dr_mode and phy_type
Michael Grzeschik [Thu, 13 Jun 2013 14:59:55 +0000 (17:59 +0300)]
usb: add devicetree helpers for determining dr_mode and phy_type

This adds two little devicetree helper functions for determining the
dr_mode (host, peripheral, otg) and phy_type (utmi, ulpi,...) from
the devicetree.

[Backport from uncommitted patch to 3.10
 - Added the dr_mode to the bindings txt file
]

Change-Id: Id535eff4da66726cf74e5cba0f39a5a93432999c
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agodra7xx : usb3_phy: Updated dpll M,N values.
Ruchika Kharwar [Tue, 7 May 2013 09:29:24 +0000 (11:29 +0200)]
dra7xx : usb3_phy: Updated dpll M,N values.

Addition of the M and N recommended values for the USB3 PHY DPLL.
Sysclk for DRA7xx is 20MHz.
This yields:
Clk = 20MHz * M/(N+1) = 20MHz * 1000 /(7+1) = 2.5 Ghz

Change-Id: I3ed359df12aa11f1f1c8580a9e38ce36bdf3b9ad
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
Signed-off-by: Ruchika Kharwar <ruchika@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Wed, 17 Jul 2013 20:23:56 +0000 (15:23 -0500)]
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  PM / OPP: Export more symbols for module usage
  PM / OPP: switch exported symbols to GPL variant
  arm: dts: omap5: Add _ck to dpll_mpu
  arm: dts: dra7xx: Add _ck to dpll_mpu
  clk: OMAP: Remove _ck assumption for DT bindings

Change-Id: I7c1388e37d111bec047b85bf697b8f8a263fc787
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Wed, 17 Jul 2013 20:21:51 +0000 (15:21 -0500)]
Merge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-linux-3.8.y

* 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  PM / OPP: Export more symbols for module usage
  PM / OPP: switch exported symbols to GPL variant
  arm: dts: omap5: Add _ck to dpll_mpu
  arm: dts: dra7xx: Add _ck to dpll_mpu
  clk: OMAP: Remove _ck assumption for DT bindings

Change-Id: I565eb2c513a4ef0ad07960ec659a7237d62103b7
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Wed, 17 Jul 2013 20:17:27 +0000 (15:17 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  PM / OPP: Export more symbols for module usage
  PM / OPP: switch exported symbols to GPL variant
  arm: dts: omap5: Add _ck to dpll_mpu
  arm: dts: dra7xx: Add _ck to dpll_mpu
  clk: OMAP: Remove _ck assumption for DT bindings

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoPM / OPP: Export more symbols for module usage
Mark Langsdorf [Mon, 28 Jan 2013 18:26:16 +0000 (18:26 +0000)]
PM / OPP: Export more symbols for module usage

Export cpufreq helpers in OPP to make the cpufreq-core0 and highbank-cpufreq
drivers loadable as modules.

Signed-off-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
9 years agoPM / OPP: switch exported symbols to GPL variant
Nishanth Menon [Mon, 28 Jan 2013 18:26:15 +0000 (18:26 +0000)]
PM / OPP: switch exported symbols to GPL variant

We are GPLV2 library, so be clear in the symbols exported as well.

Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
9 years agoarm: dts: omap5: Add _ck to dpll_mpu
Hemant Hariyani [Wed, 17 Jul 2013 19:02:19 +0000 (14:02 -0500)]
arm: dts: omap5: Add _ck to dpll_mpu

Clock frame work makes an incorrect assumption that all clock nodes
end in _ck. DT entries should have the whole name of the clock for
all clocks to be supported by omap clock framework. Not all clocks
have _ck suffix.
e.g: OMAP5 clocks: gpu_core_gclk_mux, mmc1_fclk_mux

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
[cherry-pick and format for 3.8 sdk kernel]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoarm: dts: dra7xx: Add _ck to dpll_mpu
Hemant Hariyani [Wed, 17 Jul 2013 19:00:47 +0000 (14:00 -0500)]
arm: dts: dra7xx: Add _ck to dpll_mpu

Clock frame work makes an incorrect assumption that all clock nodes
end in _ck. DT entries should have the whole name of the clock for
all clocks to be supported by omap clock framework. Not all clocks
have _ck suffix.
e.g: DRA7xx clocks: gpu_core_gclk_mux, hdmi_dpll_clk_mux, eve_clk

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
[cherry-pick and format for 3.8 sdk kernel]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoclk: OMAP: Remove _ck assumption for DT bindings
Hemant Hariyani [Wed, 17 Jul 2013 18:58:24 +0000 (13:58 -0500)]
clk: OMAP: Remove _ck assumption for DT bindings

Not all clocks have _ck suffix and this assumption was incorrect.
e.g: DRA7xx clocks: gpu_core_gclk_mux, hdmi_dpll_clk_mux, eve_clk

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
[cherry-pick and format for 3.8 sdk kernel]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Tue, 16 Jul 2013 23:34:05 +0000 (18:34 -0500)]
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  defconfig: android: SD: Enable FUSE FS
  ARM: DTS: DRA7: Enable OPP High
  ARM: dts: omap5-sevm: remove un-supported platform

Change-Id: I19aa4c0f4c9977fb40b931d83503faac6df4c63d
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Tue, 16 Jul 2013 23:31:02 +0000 (18:31 -0500)]
Merge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-linux-3.8.y

* 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  ARM: DTS: DRA7: Enable OPP High
  ARM: dts: omap5-sevm: remove un-supported platform

Change-Id: I576a173485ee5b25c8b2b6b15f08503b0a39a3c3
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agodefconfig: android: SD: Enable FUSE FS
Praneeth Bajjuri [Tue, 16 Jul 2013 22:53:26 +0000 (17:53 -0500)]
defconfig: android: SD: Enable FUSE FS

SD Card emulator expects FUSE FS to be
enabled for android.

hence enable support of
CONFIG_FUSE_FS (Filesystem in userspace)

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Tue, 16 Jul 2013 23:26:52 +0000 (18:26 -0500)]
Merge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y

* p-ti-linux-3.8.y:
  ARM: DTS: DRA7: Enable OPP High
  ARM: dts: omap5-sevm: remove un-supported platform

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: DTS: DRA7: Enable OPP High
Praneeth Bajjuri [Tue, 16 Jul 2013 22:21:46 +0000 (17:21 -0500)]
ARM: DTS: DRA7: Enable OPP High

Enable OPP_HIGH since the DRA7 samples have this
feature supported.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: dts: omap5-sevm: remove un-supported platform
Nishanth Menon [Tue, 16 Jul 2013 22:16:38 +0000 (17:16 -0500)]
ARM: dts: omap5-sevm: remove un-supported platform

Remove OMAP5-SEVM support which no longer is supported by TI.
 + build is broken with wrong Palmas LDO dependencies as well.
Just get rid of the platform we dont plan to maintain.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Mon, 15 Jul 2013 06:41:51 +0000 (01:41 -0500)]
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  OMAP5: android: defconfig: Enable display and video features
  ARM: GPIO: android: defconfig: Enable GPIO Switch Class support
  ARM: OMAP: android: defconfig: Enable Kernel Preemption
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

Change-Id: I57ce521660d34f35db5a1f3ebae451cfd787eca3
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Mon, 15 Jul 2013 06:34:16 +0000 (01:34 -0500)]
Merge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-linux-3.8.y

* 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

Change-Id: I037d8dc2a2c81e8e21c686c046a34eaf8ed8dac0
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Mon, 15 Jul 2013 06:22:02 +0000 (01:22 -0500)]
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y-video

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  OMAP5: android: defconfig: Enable display and video features
  ARM: GPIO: android: defconfig: Enable GPIO Switch Class support
  ARM: OMAP: android: defconfig: Enable Kernel Preemption

Conflicts:
arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video
Praneeth Bajjuri [Mon, 15 Jul 2013 06:20:43 +0000 (01:20 -0500)]
Merge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video

* p-ti-linux-3.8.y-video:
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption
  arm: dra: Add gpu interface clock
  arm: dra7xx: Add gpu hwmod
  arm/dts: dra7: Add gpu supply
  arm: dts: dra7xx: Add gpu data

Conflicts:
arch/arm/boot/dts/dra7-evm.dts

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoOMAP5: android: defconfig: Enable display and video features
Praneeth Bajjuri [Mon, 15 Jul 2013 05:58:30 +0000 (00:58 -0500)]
OMAP5: android: defconfig: Enable display and video features

This patch is to enable and display and video related features
to enable android accelerated UI on omap5 dev platform.

Consolidating patches from dra7 to omap5:
--
1)
commit 02668727d1125cd8526369d3e0d5ce9530753532
Author: Sunita Nadampalli <sunitan@ti.com>
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
--
2)
commit d2f13867b69439378e869550e67037eb107a5082
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPLFB: Enable OMAPLFB for compilation
--
3)
commit f5b28cfa40145c8eafec24a4ea0d4f6297ab811f
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: DSSCOMP: Configuration changes
--
4)
commit f9df0416a3c54fd879eb41b2dc35b7f25cd5819b
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPFB: Enable OMAPFB in the kernel
--
5)
commit 57256c26ecf2279416be65be5a9c016295b193d8
Author: Dandawate Saket <dsaket@ti.com>
OMAPDSS: OMAPFB: Fix fb initialization
--
6)
commit 15e2bd1fe8dc7a5d1f5d2af7cf8b4258deb0f4c2
Author: Dandawate Saket <dsaket@ti.com>
gpu: ion: Enable ion for compilation
--
7)
commit 9e9fcd68c665bb26c22c0ad56c72c5438450d5f3
Author: Dandawate Saket <dsaket@ti.com>
gpu: ion: Configuration changes
--

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: GPIO: android: defconfig: Enable GPIO Switch Class support
Praneeth Bajjuri [Mon, 15 Jul 2013 04:47:29 +0000 (23:47 -0500)]
ARM: GPIO: android: defconfig: Enable GPIO Switch Class support

As per
Documentation/android.txt
Section 1.1 : Required enabled config options

switch class support is a requirement for android
to allow userspace events on top of standard configuration.

This allows monitoring switches by userspace via sysfs and uevent.

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: OMAP: android: defconfig: Enable Kernel Preemption
Praneeth Bajjuri [Mon, 15 Jul 2013 04:24:30 +0000 (23:24 -0500)]
ARM: OMAP: android: defconfig: Enable Kernel Preemption

Extension to mentioned commit , But on android_omap5_defconfig
and android_dra7_defconfig

commit 852f4296d5b34231e19d89070d25008b8c79a03e
ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

    This patch is to enable kernel preemption on minimal omap config.

    This gives the ability for OS to preempt a current scheduled task
    in favor of a higher priority one.

Signed-off-by: Dandawate Saket <dsaket@ti.com>
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Mon, 15 Jul 2013 04:20:07 +0000 (23:20 -0500)]
Merge remote-tracking branch 'origin/p-ti-linux-3.8.y' into p-ti-android-3.8.y

* origin/p-ti-linux-3.8.y:
  ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption
Praneeth Bajjuri [Mon, 15 Jul 2013 03:45:31 +0000 (22:45 -0500)]
ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

This patch is to enable kernel preemption on minimal omap config.

This gives the ability for OS to preempt a current scheduled task
in favor of a higher priority one.

Change-Id: I5d39d9494172cbebf77386f9390ca813bab3533f
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption
Praneeth Bajjuri [Mon, 15 Jul 2013 03:45:31 +0000 (22:45 -0500)]
ARM: OMAP: omap2plus_defconfig: Enable Kernel Preemption

This patch is to enable kernel preemption on minimal omap config.

This gives the ability for OS to preempt a current scheduled task
in favor of a higher priority one.

Change-Id: I5d39d9494172cbebf77386f9390ca813bab3533f
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Sat, 13 Jul 2013 00:51:05 +0000 (19:51 -0500)]
Merge branch 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-android-3.8.y

* 'p-ti-android-3.8.y' of git://git.ti.com/android-sdk/kernel-omap: (121 commits)
  arm: dra: Add gpu interface clock
  arm: dra7xx: Add gpu hwmod
  arm/dts: dra7: Add gpu supply
  arm: dts: dra7xx: Add gpu data
  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
  ...

Change-Id: I2b876400fbd31d58ab67f813e252807c9cae34bb
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into...
Praneeth Bajjuri [Sat, 13 Jul 2013 00:42:23 +0000 (19:42 -0500)]
Merge branch 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap into p-ti-linux-3.8.y

* 'p-ti-linux-3.8.y' of git://git.ti.com/android-sdk/kernel-omap:
  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

Change-Id: Ibcf6318fb778596daf542ec9566f2ee16d7c2ca8
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
9 years agoMerge branch 'p-ti-android-3.8.y-video' of git://git.ti.com/android-sdk/kernel-video...
Praneeth Bajjuri [Sat, 13 Jul 2013 00:36:54 +0000 (19:36 -0500)]
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>
9 years agoMerge branch 'p-ti-linux-3.8.y' into p-ti-android-3.8.y
Praneeth Bajjuri [Sat, 13 Jul 2013 00:34:10 +0000 (19:34 -0500)]
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>
9 years agoarm: dra: Add gpu interface clock
Hemant Hariyani [Mon, 6 May 2013 01:02:12 +0000 (20:02 -0500)]
arm: dra: Add gpu interface clock

Add gpu iclk.

Change-Id: Id9fcf210f67998682b4e21949699b8513aafecbf
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoarm: dra7xx: Add gpu hwmod
Hemant Hariyani [Sun, 5 May 2013 23:29:18 +0000 (18:29 -0500)]
arm: dra7xx: Add gpu hwmod

GPU hwmod data for DRA7xx

Change-Id: I17f4c491e9a6a69052e9640e6bb2e74d5a753579
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoarm/dts: dra7: Add gpu supply
Hemant Hariyani [Thu, 11 Jul 2013 15:28:04 +0000 (10:28 -0500)]
arm/dts: dra7: Add gpu supply

Add smps6_reg as gpu supply

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoarm: dts: dra7xx: Add gpu data
Hemant Hariyani [Mon, 6 May 2013 14:24:48 +0000 (07:24 -0700)]
arm: dts: dra7xx: Add gpu data

GPU DT entry for DRA7XX.

Change-Id: I94c9a33f942b590244692001eb2ec8f9c98187c3
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoHDMI: Add reading edid and mode db creation
Dandawate Saket [Mon, 29 Apr 2013 08:48:47 +0000 (01:48 -0700)]
HDMI: Add reading edid and mode db creation

Add edid read and mode db databse creation to be used
by hwc.

Change-Id: I5bd4fcd5b0e5990aabab18f44f3a3bb54adedb16
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dss/hdmi.c

9 years agoHDMI: Select correct clock source.
Dandawate Saket [Mon, 29 Apr 2013 07:05:15 +0000 (00:05 -0700)]
HDMI: Select correct clock source.

Select correct clock source for HDMI pll.

Change-Id: I053c056926928b281f0b796b9d9d126de50a3f86
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoHDMI: Select DVI or HDMI based on EDID
Dandawate Saket [Mon, 29 Apr 2013 06:56:54 +0000 (23:56 -0700)]
HDMI: Select DVI or HDMI based on EDID

Select HDMI or DVI based on edid bit set.

Change-Id: I27eef1270abc645585e432a61844f00fc57ca4f7
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoHDMI: Add fb mode db construction
Dandawate Saket [Mon, 29 Apr 2013 06:42:11 +0000 (23:42 -0700)]
HDMI: Add fb mode db construction

Add fb mode db construction function and a getter
function for HWC.

Change-Id: I83ef027ffb68e33dbe2f59d3a6b39f3ec44028a6
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoHDMI: Add edid read and clear functions
Dandawate Saket [Mon, 29 Apr 2013 06:27:04 +0000 (23:27 -0700)]
HDMI: Add edid read and clear functions

Add edid read and clear function for panel driver to use.

Change-Id: I64e91266ed20de4bfbfdfe4bbd1e426a414e1503
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoHDMI: Add FB mode database setting support
Dandawate Saket [Mon, 29 Apr 2013 05:49:15 +0000 (22:49 -0700)]
HDMI: Add FB mode database setting support

Add FB mode parsing and setting the FB modes to
HDMI timing.

Change-Id: I37f631a850094c8fd7ae6165b19c9297194d73c7
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dss/hdmi_panel.c

9 years agoOMAPDSS: HDMI: Add setmode support for android
Dandawate Saket [Sat, 27 Apr 2013 07:14:13 +0000 (00:14 -0700)]
OMAPDSS: HDMI: Add setmode support for android

Add support for set mode for android HWC adaptation

Change-Id: If21f6444df6f8b48c237088825eeb24944300199
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dss/dss.h

9 years agoOMAP: HDMI : Add initial support for fb mode translation
Dandawate Saket [Sat, 27 Apr 2013 06:52:21 +0000 (23:52 -0700)]
OMAP: HDMI : Add initial support for fb mode translation

Add initial support for fb mode detection.

Change-Id: I814921c6f3b55f66dd8cba9dd389b149b64e44dc
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dss/hdmi.c

9 years agoOMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D
Hemant Hariyani [Wed, 17 Apr 2013 15:51:55 +0000 (10:51 -0500)]
OMAPDSS: OMAPLFB: (HACK) Use VRAM buffers instead of tiler 2D

Change-Id: Ie59af16a4e6eff6e616d13bf041638d4738058ff
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoOMAPDSS: OMAPLFB: VRAM buffers for second FB.
Gowtham Tammana [Mon, 28 Jan 2013 20:49:54 +0000 (14:49 -0600)]
OMAPDSS: OMAPLFB: VRAM buffers for second FB.

For JB-MR1 HWCv1.1 we need a second FB device setup at init time.
A swapchain of VRAM buffers are setup at init time.

Change-Id: Ifd5d100a939dce285ac3c844edad525043f933e8
Signed-off-by: Gowtham Tammana <g-tammana@ti.com>
9 years agogpu: OMAP2: generic Android display configuration setup
Lajos Molnar [Tue, 9 Apr 2013 21:52:13 +0000 (14:52 -0700)]
gpu: OMAP2: generic Android display configuration setup

Added android_display methods to allow runtime configuration of
Android display resources, such as:

- FB0's vram is dynamically calculated from the number of
  buffers SGX requires in VRAM (swap chain and/or composition
  buffers), and the FB0 display size.
- OMAP VRAM is calculated from FB0's vram need + any other
  specified FB's vram.  (If command line is used to specify
  FB vrams, omap vram must also be specified.)
- TILER1D area reserved for use as DSS MMU by DSSCOMP is
  calculated from default display size.  It can be overriden
  by board file.
- TILER2D carveout size is reduced by TILER1D area (if coallocated
  with TILER2D) and by the TILER2D SGX buffers (swapchain and/or
  composition buffers)
- nonsecure TILER2D carveout size is set to the backpages needed
  by TILER2D SGX buffers.

All of this is coordinated by omap_android_display_setup.  It
takes pointers to the DSS board info, FB platform data, and
optionally to the ION, SGX and DSSCOMP platform data.  It should
be called in board_reserve before omap_ion_init.

If SGX data is provided, it is set as the SGX platform data for
FB0.  Similarly, if DSSCOMP platform data is provided it is
also set.  This can be used to set a preferred tiler1d slot size.
If ION platform data is provided, it is updated with the required
tiler2d carveout sizes.

NOTE:

To maximize TILER2D space, the TILER1D area reserved for android
display is not aligned to 1MB, but is aligned to 32 pages as the
smallest 2D allocation needs a 32-page band.  We further reduce
TILER2D space by the container space lost by the SGX buffers,
which may be larger than the actual backpages bneeded for the
SGX buffers.

Therefore the sum of secure + nonsecure + 1D tiler space may
be smaller than the available container space.

Ported to latest SGX DDK by Dima Svetlov.

Change-Id: I5d8858c38efd842452994e3a3476463083d200d7
Signed-off-by: Lajos Molnar <lajos@ti.com>
Signed-off-by: Dima Svetlov <svetlov@ti.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoOMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature
Sunita Nadampalli [Wed, 29 May 2013 21:33:29 +0000 (16:33 -0500)]
OMAPDSS: DSSCOMP: OMAPLFB: Enabling dual FB configuration for multidisplay feature

Change-Id: I48c81a2a242457af28e94ac8a60d4d93ed29e728
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
arch/arm/configs/android_omap_defconfig

9 years agogpu: android-display: DO NOT MERGE: android display compilation fixes
Sundar Raman [Fri, 12 Apr 2013 14:16:02 +0000 (09:16 -0500)]
gpu: android-display: DO NOT MERGE: android display compilation fixes

there are some compilation errors seen after enabling ion because
of lack of vram apis and dsscomp platform apis in kernel.
this patch should be reverted after support for those have been
added in the kernel.

Change-Id: I57d51204a726708075d4e8c65c207d6f750381b1
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agogc320: OMAP4:GCXXX: Fixing build warnings
Volodymyr Mieshkov [Tue, 29 Jan 2013 16:15:39 +0000 (18:15 +0200)]
gc320: OMAP4:GCXXX: Fixing build warnings

Next build warnings are fixed:

--

drivers/video/omap2/omaplfb/omaplfb_linux.c:407: warning: 'OMAPLFBToUpdateMode' defined but not used
drivers/video/omap2/omaplfb/omaplfb_linux.c: In function 'OMAPLFBSetUpdateMode':
drivers/video/omap2/omaplfb/omaplfb_linux.c:609: warning: 'eUpdateMode' may be used uninitialized in this function

--

drivers/misc/gcx/gccore/gcmain.c: In function 'gc_map':
drivers/misc/gcx/gccore/gcmain.c:690: warning: assignment from incompatible pointer type
drivers/misc/gcx/gccore/gcmmu.c: In function 'virt2phys':
drivers/misc/gcx/gccore/gcmmu.c:255: warning: passing argument 1 of 'pmd_offset' from incompatible pointer type
omap/arch/arm/include/asm/pgtable-2level.h:156: note: expected 'struct pud_t *' but argument is of type 'pmdval_t (*)[2]'

Change-Id: Ica98081e3ecf362bbf4ae10b5aa2ac9cd29a5b0f
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agoOMAPDSS: OMAPLFB: Fix compilation issue for tiler path
Dandawate Saket [Tue, 9 Jul 2013 22:00:54 +0000 (15:00 -0700)]
OMAPDSS: OMAPLFB: Fix compilation issue for tiler path

Compilation fix.

Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agogpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed
Gustavo Diaz Prado [Sun, 8 Apr 2012 23:00:57 +0000 (18:00 -0500)]
gpu: omap_hwc: Adds a flag to hint omaplfb a blit FB is needed

When HWC generates blits a DSS pipe is configured and assigned
for the blit framebuffer, this patch adds a flag to give a
hint to omaplfb to use such pipe when it is present.

This helps in situations where there are not blits but blit
buffers to synchronize with and a blit buffer must be used.
In such case the rgz_items and num_ovls from dsscomp where not
enough data to recognize this scenario.

Change-Id: I2bcb13e6341189528f4ffd73c03badd431afbf15
Signed-off-by: Gustavo Diaz Prado <a0273371@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogpu: omap_hwc: Describe the api agreement with omaplfb
Tony Lofthouse [Mon, 6 Feb 2012 22:23:05 +0000 (16:23 -0600)]
gpu: omap_hwc: Describe the api agreement with omaplfb

Change-Id: I8b5173b6b89388cbb0185f5a2576893699268143
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogc320: Add header for dsscomp and optional bltsville data from Android HWC
Tony Lofthouse [Tue, 2 Apr 2013 15:09:06 +0000 (10:09 -0500)]
gc320: Add header for dsscomp and optional bltsville data from Android HWC

In order to support the OMAP4470 GC320 blit IP from HWC, we will
optionally add blit data to the payload of information passed from
HWC to the SGX display driver (OMAPLFB).

Change-Id: I016660ee1f266c1456540b8b60115cf4c8bc49a6
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agogc320: Initial Open Color format Definitions (OCD).
David Sin [Tue, 8 Nov 2011 20:55:17 +0000 (14:55 -0600)]
gc320: Initial Open Color format Definitions (OCD).

OCD is a set of Open Color format Definitions.  Color formats
are used in everything from BLTers to video codecs,
and from cameras to displays.  But although there are
plenty of common formats, the definition of the code specifying
them is never the same.

OCD attempts to solve this problem.  It provides logical color
format codes, and is extensible.

Change-Id: I56ef49f451ab9c194418500d833d204a83f66edd
Signed-off-by: Rick Tillery <rtillery@ti.com>
Signed-off-by: David Sin <davidsin@ti.com>
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files
David Sin [Thu, 17 Jan 2013 16:00:33 +0000 (18:00 +0200)]
gc320: OMAP4: adding Vivante Corp 2/3D gcxxx driver files

Driver files to enable Vivante Corp 2/3D gcxxx hardware.

Change-Id: Ic7593e603a2b078879aa7a99f6dcf8074ed6b47d
Signed-off-by: Alexei Shlychkov <x0177296@ti.com>
Signed-off-by: David Sin <davidsin@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogc320: OMAP4: adding BLTsville header files
David Sin [Mon, 24 Dec 2012 13:14:43 +0000 (15:14 +0200)]
gc320: OMAP4: adding BLTsville header files

Change-Id: If573d2ea6f0d6e858e2dae94a629458d2d767cc5
Signed-off-by: David Sin <davidsin@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogc320: Initial BLTsville API definition.
David Sin [Tue, 8 Nov 2011 20:55:17 +0000 (14:55 -0600)]
gc320: Initial BLTsville API definition.

BLTsville is the open 2-D API designed to provide an abstract
interface for both hardware and software 2-D implementations.

BLTs (BLock Transfers) involve the moving around of blocks
(rectangles) of pixels.

Change-Id: Ifced4987169acf56bfc6cf4fd6ce7fec9fcda993
Signed-off-by: Rick Tillery <rtillery@ti.com>
Signed-off-by: David Sin <davidsin@ti.com>
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
9 years agogpu: sgx_omaplfb: Create omaplfb platform device file to permit device configuration
Tony Lofthouse [Tue, 9 Apr 2013 21:40:27 +0000 (14:40 -0700)]
gpu: sgx_omaplfb: Create omaplfb platform device file to permit device configuration

Creat omaplfb initial instance

Change-Id: I9067e271bf9b680524a85ab18e97c3772a63d3ba
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
Signed-off-by: Gustavo Diaz Prado <a0273371@ti.com>
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoOMAPDSS: OMAPLFB: (HACK) Disable console locking/unlocking
Hemant Hariyani [Wed, 17 Apr 2013 15:56:19 +0000 (10:56 -0500)]
OMAPDSS: OMAPLFB: (HACK) Disable console locking/unlocking

Seems to be a problem with current kernel configuration

Change-Id: If99ac0187fb652c1d4c062f6806be5477fe5e13d
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoOMAPDSS: OMAPLFB: Enable OMAPLFB for compilation
Dandawate Saket [Sat, 13 Apr 2013 18:45:09 +0000 (11:45 -0700)]
OMAPDSS: OMAPLFB: Enable OMAPLFB for compilation

Fix compilation error and enable omaplfb.

Change-Id: Id641a0ece2f73f146bd843baa12d6092e4290027
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
arch/arm/configs/android_omap_defconfig
drivers/video/omap2/omapfb/Kconfig

9 years agoOMAPDSS: OMAPLFB: adapt to K3.8 ION
Sundar Raman [Fri, 12 Apr 2013 18:58:43 +0000 (13:58 -0500)]
OMAPDSS: OMAPLFB: adapt to K3.8 ION

Adapt omaplfb to new ion calls.

Change-Id: Ia5a1347a073d0536ebb67f48b01b3ff721a14544
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agoOMAPDSS: OMAPLFB: remove dependency on vrfb
Sundar Raman [Fri, 12 Apr 2013 18:43:30 +0000 (13:43 -0500)]
OMAPDSS: OMAPLFB: remove dependency on vrfb

Remove VRFB compilation dependency.

Change-Id: I25cf07c38752dbaac225f9f0af5c557adca72ce6
Signed-off-by: Sundar Raman <a0393242@ti.com>
9 years agoOMAPDSS: OMAPLFB: remove early_suspend handling
Sergiy Kibrik [Mon, 11 Mar 2013 15:34:24 +0000 (17:34 +0200)]
OMAPDSS: OMAPLFB: remove early_suspend handling

omaplfb can handle only suspend/resume of just one display
attached to framebuffer, thus can't suspend secondary HDMI
display. Early_suspend/late_resume now handled by DSS core,
for each display without limitations, hence removing this code.

Change-Id: I3c30d618d7dfdba540920d3aac48ba96a21dc3e2
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
9 years agoOMAPDSS: OMAPLFB: skip init in case of invalid framebuffer
Sergiy Kibrik [Fri, 5 Oct 2012 10:26:24 +0000 (13:26 +0300)]
OMAPDSS: OMAPLFB: skip init in case of invalid framebuffer

Don't go on with omaplfb devinfo initialization if corresponding framebuffer
has not been properly allocated -- has invalid parameters of width/heigth.

This is going to be needed later, when there will be possibility of
multiple framebuffers and swapchains to co-exist.

Change-Id: I85d3554750305d645f78b4c5a076b901fef3d2b4
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
9 years agoOMAPDSS: OMAPLFB: add rotation check to pass the correct stride
Jack Yen [Thu, 3 Jan 2013 14:43:21 +0000 (16:43 +0200)]
OMAPDSS: OMAPLFB: add rotation check to pass the correct stride

The patch fixed the stride calculation based on rotation angle.

Ported from k3.0, commit Id 6da9df431be5b [Jack Yen <jyen@ti.com>]

Change-Id: I7bb5e798568004e7429a5aff870ac9c5b64f87c6
Signed-off-by: Jack Yen <jyen@ti.com>
Signed-off-by: Volodymyr Mieshkov <volodymyr.mieshkov@ti.com>
9 years agoOMAPDSS: OMAPLFB: Dont foward compositions to DSSCOMP if overlay is Zero
Dandawate Saket [Tue, 21 Aug 2012 23:00:23 +0000 (16:00 -0700)]
OMAPDSS: OMAPLFB: Dont foward compositions to DSSCOMP if overlay is Zero

Do not foward compositions to DSSCOMP in case overlay number
passed by HWC is zero. The dsscomp->num_overlay = 0 means
that there is no primary display and no rendering is required.

Change-Id: If7b582efeb55ce84878d0bfbd19eabd2ebd3afaa
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoOMAPDSS: OMAPLFB: Add omaplfb to the kernel tree
Hemant Hariyani [Tue, 9 Apr 2013 22:10:35 +0000 (15:10 -0700)]
OMAPDSS: OMAPLFB: Add omaplfb to the kernel tree

omaplfb has dependencies on several kernel components and it will
be easier to maintain it in the kernel tree.

Sync'd to DDK omaplfb patch:
omaplfb: Allocate a clear buffer with 8 pixel stride per GC requirement

Change-Id: Ia6b81bb442b17162b6753ba5b4cba53d96d9b3a2
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Signed-off-by: Tony Lofthouse <a0741364@ti.com>
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
9 years agoOMAPDSS: DSSCOMP: Update bit-field info for BGRA32 color format
Sreenidhi Koti Ananda Rao [Tue, 2 Apr 2013 15:02:40 +0000 (10:02 -0500)]
OMAPDSS: DSSCOMP: Update bit-field info for BGRA32 color format

Descrition: The bit-field info is used by the truncation logic, if
enabled, for the specific color format chosen.This patch appends the
BGRA color format & updates the corresponding bit-fields.

Change-Id: Ie78e1869d589012b604ed86a85bf1b132cbf6feb
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: update overlay enabled along with other attibutes
Sunita Nadampalli [Thu, 9 May 2013 18:30:20 +0000 (13:30 -0500)]
OMAPDSS: DSSCOMP: update overlay enabled along with other attibutes

Change-Id: I8174f94311255691cca9c18f7d5315f819ee444b
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
9 years agoOMAPDSS: DSSCOMP: Null pointer check for mgr, output
Hemant Hariyani [Wed, 17 Apr 2013 15:47:13 +0000 (10:47 -0500)]
OMAPDSS: DSSCOMP: Null pointer check for mgr, output

Avoids kernel panic when mgr or mgr->output is null.

Change-Id: I1dbe7a1e77fbdfd2c598af27ba7bb68c12bca317
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
9 years agoOMAPDSS: DSSCOMP: register early callback at suspend
Sergiy Kibrik [Wed, 3 Apr 2013 20:21:41 +0000 (15:21 -0500)]
OMAPDSS: DSSCOMP: register early callback at suspend

Zero composition queued at suspend doesn't need to
wait to be released, as there's actually nothing to display.

Releasing composition after it's programmed is enough, also
in case of manually updated displays composition callback
never gets called, so queue is stuck and dsscomp can't
properly resume.

Change-Id: I8fe5f4704fc0907bbbd6b2ea1176e46b83b8143d
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: enable alpha blending at suspend
Sergiy Kibrik [Wed, 3 Apr 2013 20:19:23 +0000 (15:19 -0500)]
OMAPDSS: DSSCOMP: enable alpha blending at suspend

set_dss_mgr_info() refuses to accept configurations without
alpha blending enabled, thus in the very last composition
queued in suspend handler we have to explicitly enable it.

Change-Id: Ic663e9d7166e7386998cda3233791482adead0bd
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: fix channel selection in gralloc_queue
Sergiy Kibrik [Wed, 3 Apr 2013 20:16:07 +0000 (15:16 -0500)]
OMAPDSS: DSSCOMP: fix channel selection in gralloc_queue

Channels don't always represent mgr_ix from setup data, e.g.
in case of HDMI as primary display channel used is 1 (tv), while
0 id is passed from userspace via overlay's config.

Change-Id: I20c7ac6f5283ffffc56641ec97cd21dfd701c6d7
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: do not unpin blocks when splitting/merging slots
Sergiy Kibrik [Wed, 3 Apr 2013 20:14:01 +0000 (15:14 -0500)]
OMAPDSS: DSSCOMP: do not unpin blocks when splitting/merging slots

Calling tiler_unpin() happens to have occational side effects
like delays, which might cause FIFO underflows in DISPC.

Change-Id: I3c911bd6bd6fb62d4c7423ba6edae60fafab0fb3
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: do not clone from disabled layer
Sergiy Kibrik [Wed, 3 Apr 2013 20:11:08 +0000 (15:11 -0500)]
OMAPDSS: DSSCOMP: do not clone from disabled layer

In case of cloning layer from other overlay, we should always check
whether overlay we want to clone from is valid, or we may run
into severe troubles. One example of failing case is when 1D mapping
of overlay fails, we can't clone from it, as it will be disabled and
we will eventually end up with memory violation.

Change-Id: Ic230d965b09df62e7a15e7b89364f169783bdb9e
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: split tiler1d slots for multi-display
Sergiy Kibrik [Wed, 3 Apr 2013 20:09:19 +0000 (15:09 -0500)]
OMAPDSS: DSSCOMP: split tiler1d slots for multi-display

When switching to multi-display presentation mode, gralloc queue
needs to hold at most 4 compositions in parallel, thus requiring
4 tiler1d slots to map layers. For not to take additional tiler1d
space beyond 32Mb, we split 2 slots into 4 smaller slots, which
reflects the way hwcomposer manages layers in userspace.
When quitting presentation mode slots merged back into 2 lagre chunks.

Until tiler API supports blocks splitting/merging, we use hack
of first releasing and immediately requesting different size block.

Change-Id: I1f323f77235f8380833bc7322b589bd2504d37e3
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: allow separate comp to tv
Sergiy Kibrik [Wed, 3 Apr 2013 20:06:18 +0000 (15:06 -0500)]
OMAPDSS: DSSCOMP: allow separate comp to tv

Add support to queue separate sets of compositions independently
for separate managers.

Change-Id: I1a8e639062b5082222dfbc4be146fbfea1fd82f9
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: Add force_1d client support for dispc
Sreenidhi Koti Ananda Rao [Wed, 3 Apr 2013 19:57:59 +0000 (14:57 -0500)]
OMAPDSS: DSSCOMP: Add force_1d client support for dispc

Description: This patch adds client support for dispc force_1d
feature.

Change-Id: Ia4dbd5f96a82b5274c92bdb425fdd7245343d7ea
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: Export symbol tiler_pa_free
Rodrigo Obregon [Wed, 3 Apr 2013 19:49:14 +0000 (14:49 -0500)]
OMAPDSS: DSSCOMP: Export symbol tiler_pa_free

Export symbol tiler_pa_free required by the
omaplfb component.

Change-Id: Ieca5b515bc2442b609b6650fcb84560552783466
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: Enable compatibility mode
Arthur Philpott [Tue, 2 Apr 2013 16:02:40 +0000 (11:02 -0500)]
OMAPDSS: DSSCOMP: Enable compatibility mode

Initialize compatibility mode for DSSCOMP

Change-Id: Ibb97b38e59ba19bfdc09ec232137bf29e370c247
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
9 years agoOMAPDSS: DSSCOMP: Fix sparse warnings in gralloc
Dan Murphy [Tue, 2 Apr 2013 15:11:28 +0000 (10:11 -0500)]
OMAPDSS: DSSCOMP: Fix sparse warnings in gralloc

Fix sparse warning:
drivers/video/omap2/dsscomp/gralloc.c:343:11: warning: symbol 'size' shadows an earlier one
drivers/video/omap2/dsscomp/gralloc.c:309:7: originally declared here
drivers/video/omap2/dsscomp/gralloc.c:563:10: warning: symbol 't' shadows an earlier one
drivers/video/omap2/dsscomp/gralloc.c:524:22: originally declared here

Change-Id: Iedd59c2ac59ae98d81d59a76f6f0b844aecba7fe
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>