android-sdk/kernel-video.git
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agoOMAPDSS: DSSCOMP: Add MFLAG support in DSSCOMP
Sreenidhi Koti Ananda Rao [Tue, 2 Apr 2013 15:05:25 +0000 (10:05 -0500)]
OMAPDSS: DSSCOMP: Add MFLAG support in DSSCOMP

Descrition: This patch adds client support for dispc MFLAG feature.

Change-Id: I10d4784a1bbdd91d05fbf4b21b5780a0bd79b873
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: WA: dsscomp header changes for WB support
Varadarajan, Charulatha [Tue, 2 Apr 2013 14:02:21 +0000 (09:02 -0500)]
OMAPDSS: DSSCOMP: WA: dsscomp header changes for WB support

Sync Android file system's userspace and kernel 3.4 space dsscomp
header files. Current Android file system has changes for writeback
handling. Until writeback kernel patches are available for
K3.4, this workaround patch is required.

Change-Id: Ibf7dd95de85ce05bbbde07dc55c435adce15fb46
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS:DSSCOMP: Ignore display resolution for WB source overlay
Artem Rudenko [Tue, 2 Apr 2013 14:47:41 +0000 (09:47 -0500)]
OMAPDSS:DSSCOMP: Ignore display resolution for WB source overlay

When WB capture from an overlay in MEM2MEM mode, the captured
image may be up-scaled beyond the size of the display.

Change-Id: If292f13c2e68ca6912a4ebdc5ea84146690ac93c
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: Resolve compiler errors/warnings when CONFIG_DSSCOMP_DEBUG_LOG...
Dan Murphy [Tue, 2 Apr 2013 14:12:45 +0000 (09:12 -0500)]
OMAPDSS: DSSCOMP: Resolve compiler errors/warnings when CONFIG_DSSCOMP_DEBUG_LOG is not set

When CONFIG_DSSCOMP_DEBUG_LOG is not set there are two issues

Resolve compiler error:
drivers/video/omap2/dsscomp/base.c: In function 'set_dss_mgr_info':
drivers/video/omap2/dsscomp/base.c:397: error: 'alpha_only' undeclared

Resolve compiler warning:
drivers/video/omap2/dsscomp/gralloc.c: In function 'dsscomp_dbg_gralloc':
drivers/video/omap2/dsscomp/gralloc.c:541: warning: unused variable 'i'

Change-Id: I55a157b478e112c2bd8a475a821f5aff7cc571a7
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: Handle inactive state in composition apply
Muralidhar Dixit [Tue, 2 Apr 2013 14:08:28 +0000 (09:08 -0500)]
OMAPDSS: DSSCOMP: Handle inactive state in composition apply

We ignore the error due to display in inactive state during
mgr->apply. This leave the composition in applied state if
display is disabled or suspended inbetween composition apply.
On system suspend with HDMI connected compositions are still
applied even after HDMI becomes inactive( suspend state). On
resume SGX starts dumping because one composition is struck
in applied state.

This patch fixes this issue by calling mbg->blank to
clear such compositions.

Change-Id: Ib0498b97c23c129a673678517d665b1bdb462eb3
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS : DSSCOMP : Avoid pushing content if no panel is active
Dandawate Saket [Tue, 2 Apr 2013 13:40:56 +0000 (08:40 -0500)]
OMAPDSS : DSSCOMP : Avoid pushing content if no panel is active

Currently we push content on a blanked manager in case it is
default HDMI display. This causes a lot of logging in dsscomp call
back when we apply blank to manager.

Check added to see if number of overlay in the composition are not
zero.

In HWC we are checking if the default display is not present
we will populate the composition number of overlay as zero.

Dependencies:
This patch has dependency on HWC patch mentioned below..
http://review.omapzoom.org/#/c/26472/ - JB release

Change-Id: Icadfecb8f88adf3c6020b17d1869b5bb49b0efe6
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: Switch to multiple overlay apply mechanism
Sreenidhi Koti Ananda Rao [Mon, 1 Apr 2013 20:33:21 +0000 (15:33 -0500)]
OMAPDSS: DSSCOMP: Switch to multiple overlay apply mechanism

Description: This patch corresponds to changes required to move to
the new apply mechanism in the DSS driver. The overlay manager keeps
track of the number of overlays requiring update & puts it into an
array before sending to the DSS2 driver.

Change-Id: Ia7d19877f2e24942933cd660d0b08aa4acfb9c53
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dsscomp/base.c

8 years agoOMAPDSS: DSSCOMP: Remove HDMI_ENABLE flag from dsscomp
Muralidhar Dixit [Mon, 1 Apr 2013 20:23:19 +0000 (15:23 -0500)]
OMAPDSS: DSSCOMP: Remove HDMI_ENABLE flag from dsscomp

Enable HDMI support in DSSCOMP driver. HDMI related
code was put under compile flag during dsscomp porting.
Removing the flag to have HDMI working.

Change-Id: I9c7d860de5e8f8a66307a6aeaed0c97f7cda6048
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: move device to omap plat to configure tiler1d slot
Tony Lofthouse [Mon, 1 Apr 2013 20:10:00 +0000 (15:10 -0500)]
OMAPDSS: DSSCOMP: move device to omap plat to configure tiler1d slot

Different devices will have varying requirements on tiler resources. This
change moves the platform device registration for dsscomp to the omap
platform level so at device initialization time we can set the appropriate
Tiler1D slot size.

Get platform information from dss2 driver, instead of it being hardcoded in
dsscomp clients. DSSCOMP query platform ioctl returns the platform specific
configuration, platform_info

Change-Id: I23c310294a96b711ea5782bddf732f10cc76e758
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSSCOMP: Enable & Disable function support for overlays
Sreenidhi Koti Ananda Rao [Mon, 1 Apr 2013 20:06:13 +0000 (15:06 -0500)]
OMAPDSS: DSSCOMP: Enable & Disable function support for overlays

Description: This patch adds support for enabling and disabling the
overlays in DSSCOMP. In earlier kernels this was handled by the enabled
flag in info structure. It has been deprecated in K3.4 & now overlay
enable & disable needs to be done manually by the omap_overlay
enable & disable functions.

Change-Id: Ic931e01ed3a384e9f32914a6f07602d4f2d7b6ca
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
Conflicts:
drivers/video/omap2/dsscomp/base.c

8 years agoOMAPDSS: DSSCOMP: Configuration changes
Dandawate Saket [Tue, 9 Jul 2013 21:02:17 +0000 (14:02 -0700)]
OMAPDSS: DSSCOMP: Configuration changes

Added configuration changes to include all
dependencies needed by DSSCOMP and enable
DSSCOMP by default

Change-Id: I6f7377b8caac991c046cb03ddbe1815101a5f3bd
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: DSSCOMP: New composition module
Lajos Molnar [Wed, 27 Mar 2013 17:44:05 +0000 (12:44 -0500)]
OMAPDSS: DSSCOMP: New composition module

This patch implements a new DSS composition module.

DSSCOMP allows specifying a whole composition for a DSS display:

    1. set overlay information for all overlays on a manager
    2. reroute the overlays to the manager (overlay must be disabled
       just as when using sysfs)
    3. set manager information
    4. optionally call manager->apply() that programs the DISPC
    4. optionally do an update (after a sync call)

    DSS already implements coordinated updates by separating overlay
    information setting from the applicaion of those settings (which
    happens only in manager->apply()).  However current clients of DSS
    call manager->apply() for each change, which make coordinated
    change impossible.

    This API also implements auto cropping of all layers to the display
    region.  This makes switching displays and handling display resolution
    changes easier (without getting "failed to setup overlay" messages.)

DSSCOMP operates on 3 levels.

base.c contains the basic DSS operations, such as setting DSS overlay
and managers using DSSCOMP's setting structures.  Theoretically,
DSSCOMP could be used via only these operations.

queue.c contains the queuing mechanism.  This module maintains
compositions queued to each overlay manager (the basic DSS composition
entity).  Queueing operations consist of creating a composition,
setting/getting manager/overlay information for the composition,
applying the composition to the display (which also displays it
on manually updated panels), waiting on various states of a composition.

For now the basic queuing mechanism of DSSCOMP is "queue and forget".
Therefore, it is not necessary to dequeue each frame queued.  A
consequence of this methodology is that if one applies a composition
to a display, any prior unapplied compositions will be dropped.

Compositions are applied asynchronously (delayed apply) so that
they can be queued from irq context.

The queuing interface tracks which overlay is assigned to which
manager.  This is done at the DSS programming level, as that is the
most reliable place to monitor overlay ownership.  Nonetheless,
the device interface uses overlay information to verify overlay
ownership - which may be slightly out of sync.  The user of
DSSCOMP should maintain overlay ownership to ensure flawless
sharing of overlays between managers.  (E.g. should not use an
overlay on a new manager, until the overlay has been disabled on
the previous manager, and that composition has been programmed.)

Buffers must be displayable (e.g. TILER2D or physically contiguous).

device.c contains the device hooks to operating system, and the file
interface (via /dev/dsscomp's ioctls).  /dev/dsscomp works on top of
the queueing mechanism.

There are 3 levels of header files.

linux/dsscomp.h: basic dsscomp structures and ioctls
plat/dsscomp.h: kernel dsscomp interface (on top of linux/dsscomp.h)
local dsscomp.h: common implementation structures and shared methods

An additional Android adaptation layer is also provided.  This
sits on top of DSSCOMP and allows specifying all overlays on all
managers in a single operation as required by Android's rendering
model.  Here the checking of overlays is slightly relaxed as
Android makes sure that an overlay is detached from a display
before it is attached to another one.  This interface also
uses ION/TILER to remap non-contiguous buffers into contiguous
TILER1D space - so they can be displayed by DISPC.

At the Android level buffers can be specified with a set of
pages, using offsets into FBMEM (contiguous), or by referencing
prior overlays (e.g. cloning).

Note: plat/dsscomp.h defines a handle typedef that causes a
checkpatch warning.  I feel that the creation of a handle typedef
is warranted.

Limitations:
- no WB support
- unsure whether to call sync on non-manual update panels
- cannot get overlay/manager information on a composition without
first having set it

Change-Id: I9e9c0fc6e5ed0bf4f077af9f755cee35d436990b
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Enable OMAPFB in the kernel
Dandawate Saket [Thu, 27 Jun 2013 19:29:12 +0000 (12:29 -0700)]
OMAPDSS: OMAPFB: Enable OMAPFB in the kernel

Enable omapfb compilation in kernel

Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Update bit-field info for BGRA32 color format
Sreenidhi Koti Ananda Rao [Tue, 2 Apr 2013 15:02:40 +0000 (10:02 -0500)]
OMAPDSS: OMAPFB: 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>
8 years agoOMAPDSS: OMAPFB: Initialize all devices for default timings
Dandawate Saket [Wed, 22 May 2013 00:58:27 +0000 (17:58 -0700)]
OMAPDSS: OMAPFB: Initialize all devices for default timings

If the FB device have timings then set it up as default.
Right now it is used for HDMI only.

Change-Id: I2b5116c9010befa7d612683ebec2b443bb1d5b5d
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Decouple DRM and FB
Dandawate Saket [Thu, 27 Jun 2013 05:15:30 +0000 (22:15 -0700)]
OMAPDSS: OMAPFB: Decouple DRM and FB

Fix compilation break and decouple DRM and FB.

Change-Id: I237bc0f31f7ce79760c71f2d0179451e0c547eb4
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: (HACK) Double buffer for swap chain
Hemant Hariyani [Wed, 17 Apr 2013 15:54:56 +0000 (10:54 -0500)]
OMAPDSS: OMAPFB: (HACK) Double buffer for swap chain

This hack ensures OMAPFB providing sufficient size of swap chain.

Change-Id: Ic88186c2599569158a1e9bda6b579cd3ad033479
Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
8 years agoOMAPDSS: OMAPFB: Fix fb initialization
Dandawate Saket [Fri, 12 Jul 2013 22:31:48 +0000 (17:31 -0500)]
OMAPDSS: OMAPFB: Fix fb initialization

Correcting the patch porting mistake.
Change-Id: Iae23c48aa5ccc34f4855cd0f90aa09685117fe67

Signed-off-by: Hemant Hariyani <hemanthariyani@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
--
[resolve rebase conflict]
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
8 years agoOMAPDSS: OMAPFB: return error when can't enable vsync
Sergiy Kibrik [Thu, 28 Feb 2013 17:45:42 +0000 (19:45 +0200)]
OMAPDSS: OMAPFB: return error when can't enable vsync

When device is not active we can't register VSYNC isr, but
must explicitly notify about it, so caller can handle error
and not wait for VSYNC that never happens.

Change-Id: Idc83d8bdc6b8c590fee6dd916717871455c12efd
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
8 years agoOMAPDSS: OMAPFB: assign DSS managers to all framebuffers
Sergiy Kibrik [Tue, 12 Feb 2013 13:01:55 +0000 (15:01 +0200)]
OMAPDSS: OMAPFB: assign DSS managers to all framebuffers

Currently all overlays set to mgr0 by default. This leaves only
one display device to omapfb_fb_init() to work with, which causes
all framebuffers to be of same resolution. Instead we assign each
overlay a different manager, thus each framebuffer is linked
to separate display.

Change-Id: I8b185e294c35cb930c774bec9f9dba69ffed2403
Signed-off-by: Sergiy Kibrik <sergiy.kibrik@globallogic.com>
8 years agoOMAPDSS: OMAPFB: Add BGRA32 support in FB Driver
Sreenidhi Koti [Mon, 22 Oct 2012 09:24:50 +0000 (14:54 +0530)]
OMAPDSS: OMAPFB: Add BGRA32 support in FB Driver

Description: This patch adds BGRA32 color format support for FB driver
relevant to OMAP5 ES2.0 silicons,

Change-Id: I841682437f6a74d355e249431373681cbbdb8ff5
Signed-off-by: Sreenidhi Koti <sreenidhi@ti.com>
8 years agoOMAPDSS: OMAPFB: Select correct VSYNC IRQ based on DSS channel
Muralidhar Dixit [Tue, 9 Apr 2013 23:41:35 +0000 (16:41 -0700)]
OMAPDSS: OMAPFB: Select correct VSYNC IRQ based on DSS channel

Select correct VSYNC IRQ for asynchronous vsync notification
based on the DSS channel.
Current VSYNC notification supports only primary LCD panel.
To support VSYNC notification for default HDMI display this
patch adds the VSYNC IRQ selection based on the DSS channel
for default display.

Change-Id: I0594e80d4b4850c278e6bdd3b07c0cb63488be39
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Do not suspend HDMI driver in early suspend.
Dandawate Saket [Thu, 13 Sep 2012 01:12:05 +0000 (18:12 -0700)]
OMAPDSS: OMAPFB: Do not suspend HDMI driver in early suspend.

Issue:
HDMI Audio can be active even if display activity
times out.

Analysis:
To save power approach to suspend panel on an
early suspend call was taken. This call of panel
suspend is done by OMAPLFB on early suspend
callback.

There is no issue in case of LCD since it doesnt
carry any audio. Also we only suspend the default
panel and not all the connected panels.

If hdmi is default display we cut HDMI clocks via
omapfb->blank call with NORMAL enum. HDMI audio
driver will close DMA only after the timeout
in userspace.

So we are voilating the expectation of HDMI audio
driver in case HDMI is default panel.

In case HDMI is default there is almost no use case
with battery power devices.

With this fix we can have an HDMI audio playback
happening when display inactivity times out
triggering early suspend.

Change-Id: I2180a20b1579bec8a3f910a5e349fb219437089a
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB : Dont error if default display is ON
Dandawate Saket [Fri, 6 Jul 2012 22:16:29 +0000 (15:16 -0700)]
OMAPDSS: OMAPFB : Dont error if default display is ON

Dont error if default display state is already ON.

Change-Id: I25120083613f5e0ef0e2fea7a5fd26182e1e4b7e
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB : Add support for default display scaling.
Dandawate Saket [Thu, 27 Jun 2013 07:20:42 +0000 (00:20 -0700)]
OMAPDSS: OMAPFB : Add support for default display scaling.

Currently it is assumed that frame buffer size
is same as default panel size. With this assumption
GFX pipeline is always presented to default display FBDev.
GFX pipeline cannot scale so we cannot have a frame
buffer which is not equal to panel size (LCD | HDMI).
Updated the current logic of omapfb to pick video pipelines
in case scaling is required for FB to be presented to default
panel.

To provide FB size option is provided via command line.
e.g
omapfb.fb_opt=0,720,1280,1,640,480
each element is [fb_ix,width,height]

Change-Id: I0b546932ff9119166e123b7bf08352ca836b0842
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Asynchronous vsync notification
Erik Gilling [Tue, 9 Apr 2013 23:24:24 +0000 (16:24 -0700)]
OMAPDSS: OMAPFB: Asynchronous vsync notification

Enabled and disabled through new OMAPFB_ENABLEVSYNC ioctl.  Events delivered
as switch events.

Change-Id: Ie473d96732c5bf2259bac6205d0295d698e6e48b
Signed-off-by: Erik Gilling <konkers@android.com>
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Use omapdss_display_get_dimensions()
Dandawate Saket [Thu, 27 Jun 2013 07:07:19 +0000 (00:07 -0700)]
OMAPDSS: OMAPFB: Use omapdss_display_get_dimensions()

Use generic omapdss_display_get_dimensions() to get the panel
dimensions.

Change-Id: I33d5d19fe0a48d0dc2a90c49e3439c9bbd56074c
Signed-off-by: Lajos Molnar <lajos@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Change default color format to ARGB32
Mark Tyler [Fri, 30 Sep 2011 11:58:56 +0000 (17:28 +0530)]
OMAPDSS: OMAPFB: Change default color format to ARGB32

Earlier the default color format of the framebuffer was xRGB24U, but SGX
is producing data in ARGB32. Also, SGX - the FB driver user - doesn't negotiate
with FB driver for the format and thus FB needs to provide ARGB32 as default
to align with SGX format.

Change-Id: I5609d633cec3104d7711d163d47dd4da803d6ff3
Signed-off-by: Mark Tyler <mark.tyler@ti.com>
Signed-off-by: Varadarajan, Charulatha <charu@ti.com>
8 years agoOMAPDSS: OMAPFB: Switch HDMI timings & EDID handling to use fbmon
Lajos Molnar [Sat, 9 Jun 2012 10:07:22 +0000 (15:37 +0530)]
OMAPDSS: OMAPFB: Switch HDMI timings & EDID handling to use fbmon

1. Change hdmi_timings to fb_videomode that contains the same
information (and more) as the private hdmi_timigs

Use fb modedb to get timings and CEA pixel ratio info.

Relaxed mode checking to allow 0.5% tolerance in the
pixel clock - as required by CEA standard.

2. Change mode lifecycle
 - on HDMI power ON, first select VGA mode, as this is the universally
   supported format
 - before disabling HDMI, reset mode so that if starts in VGA again.
   However, do not do this in hdmi_power_off, only in disable display,
   so we keep the mode on suspend, as there will be no hpd event forcing
   an edid read.

3. Added set_mode hook to HDMI which now implements this call.

Change-Id: Iaf0e88527ee5860fc7c8c1ac04dea1fb4bed67ff
Signed-off-by: Lajos Molnar <lajos@ti.com>
Signed-off-by: Varadarajan, Charulatha <charu@ti.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
8 years agoOMAPDSS: OMAPFB: export functions for PVR driver
Rodrigo Obregon [Fri, 25 May 2012 20:46:15 +0000 (15:46 -0500)]
OMAPDSS: OMAPFB: export functions for PVR driver

Export omapfb_set_update_mode and omapfb_get_update_mode
needed by the PVR kernel modules.

Change-Id: I5b4f2feeb2c8280550df06fafa76cc1ed6ce79bf
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
8 years agoOMAPDSS: OMAPFB: Export omapfb_mode_to_dss_mode.
Lajos Molnar [Thu, 24 May 2012 22:12:29 +0000 (17:12 -0500)]
OMAPDSS: OMAPFB: Export omapfb_mode_to_dss_mode.

This method is used to set up DSSCOMP structures from OMAPLFB.

Change-Id: I97506443306b3f96f246602c9d3bef065d649541
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Lajos Molnar <molnar@ti.com>
8 years agoARCH: OMAP: FB: Omapfb_set_platform_data move
Arthur Philpott [Fri, 12 Apr 2013 13:29:05 +0000 (08:29 -0500)]
ARCH: OMAP: FB: Omapfb_set_platform_data move

Omapfb_set_platform_data function must be moved before
the initialization or else omapfb_config will never
be set with the correct data.

Change-Id: I8366f54973fdb367cc3e47714b92216ffbe0691b
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: OMAPFB : Add support for VRAM size read
Dandawate Saket [Tue, 24 Jul 2012 20:41:31 +0000 (13:41 -0700)]
OMAPDSS: OMAPFB : Add support for VRAM size read

Add support to read vram size set by board file.
This value is then used in to create framebuffers in
vram. If the board file doesnt set the memory region
then vram which can fit in only 1 flip chain buffer
is allocated.

Change-Id: I5c53af56eafe70ae1fba0212f2a17e66e4381c88
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoOMAPDSS: OMAPFB: Add support to set VRAM dynamically
Dandawate Saket [Wed, 10 Apr 2013 17:36:38 +0000 (10:36 -0700)]
OMAPDSS: OMAPFB: Add support to set VRAM dynamically

Add support to set VRAM dynamically from board file
for framebuffer. This is required so that we can avoid
the commandline frequent modification to fit in
flip buffers.

Change-Id: I642fbeea35b8a08b95559c92fb591674de4a2d3b
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agovideo: fbmon: fixed E-EDID SVD entry parsing
Eric Laurent [Thu, 15 Sep 2011 17:30:46 +0000 (10:30 -0700)]
video: fbmon: fixed E-EDID SVD entry parsing

Fixed index calculation when parsing E-EDID block SVD entry
in fb_edid_add_monspecs().

Change-Id: I2947f56890affcde10b56bb50e740c6bb8abd063
Signed-off-by: Eric Laurent <elaurent@google.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agovideo: fbmon: add HDMI detection to fbmod edid parsing
Erik Gilling [Mon, 7 Feb 2011 03:32:17 +0000 (19:32 -0800)]
video: fbmon: add HDMI detection to fbmod edid parsing

Looks for ieee registration number 0x000c03 as per HDMI spec.
CEA-861-E section D.6.8.

Change-Id: Ic2339083c9bd28cd15bb8e8a367bc8901a0045ce
Signed-off-by: Erik Gilling <konkers@android.com>
Signed-off-by: Lajos Molnar <molnar@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agovideo: fbmon: Add support for CEA pixel ratios.
Lajos Molnar [Thu, 11 Apr 2013 08:39:01 +0000 (01:39 -0700)]
video: fbmon: Add support for CEA pixel ratios.

CEA defines multiple timings with dual timing ratios that cannot
be distinguished from timings parameters.  Added 2 new fb flags
to specify 4:3 or 16:9 display ratios.

Also added a flag that denotes CEA formats that require repeating
pixels.

Also added VESA_MODEDB_SIZE to vesa_code definition to ensure that
the size corresponds to the actual array size.

Change-Id: I2ab6d72682173cdaabb1c13038710d370aa2d817
Signed-off-by: Lajos Molnar <molnar@ti.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agovideo: fbmon: add remaining modes to CEA mode database
Erik Gilling [Tue, 13 Sep 2011 20:44:44 +0000 (13:44 -0700)]
video: fbmon: add remaining modes to CEA mode database

These mode are directly from the CEA-861-E spec
Table 3 Video Format Timings Detailed Sync Information.

Change-Id: Ib46f1e9f598ed7a018cb147a71730ec9edee1229
Signed-off-by: Erik Gilling <konkers@android.com>
Signed-off-by: Muralidhar Dixit <murali.dixit@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agoION: Add ion support for DRA7
Dandawate Saket [Mon, 6 May 2013 16:22:42 +0000 (09:22 -0700)]
ION: Add ion support for DRA7

Add ion support for DRA7

Change-Id: Iee1b8ca1f0de6ca7d4e3ea5d2cc1dcccf803239b
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Fix compilation warnings
Dandawate Saket [Tue, 9 Jul 2013 20:26:01 +0000 (13:26 -0700)]
gpu: ion: Fix compilation warnings

Fix type casting compilation warning.

Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Enable ion for compilation
Dandawate Saket [Fri, 28 Jun 2013 04:19:56 +0000 (21:19 -0700)]
gpu: ion: Enable ion for compilation

Enable ion for compilation

Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Fix compilation error for ion
Dandawate Saket [Fri, 28 Jun 2013 04:18:20 +0000 (21:18 -0700)]
gpu: ion: Fix compilation error for ion

Tiler driver has been moved from staging folder to gpu/drm.

Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Decouple DMM from DRM driver
Dandawate Saket [Fri, 28 Jun 2013 03:29:16 +0000 (20:29 -0700)]
gpu: ion: Decouple DMM from DRM driver

DMM/Tiler needs to be a separate driver.  This patch decouples
the two drivers from one another and makes the DMM/Tiler a
viable standalone driver.

Change-Id: I7cbd43374fd04ae6565fbc42b8e3f381cab7b624
Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Decouple DMM from DRM driver
Andy Gross [Thu, 10 May 2012 22:01:08 +0000 (17:01 -0500)]
gpu: ion: Decouple DMM from DRM driver

DMM/Tiler needs to be a separate driver.  This patch decouples
the two drivers from one another and makes the DMM/Tiler a
viable standalone driver.

Change-Id: I7cbd43374fd04ae6565fbc42b8e3f381cab7b624
Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
8 years agogpu: ion: Tiler functionality added
Dandawate Saket [Fri, 28 Jun 2013 03:03:17 +0000 (20:03 -0700)]
gpu: ion: Tiler functionality added

Tiler functionality added for the DSSCOMP module.

Change-Id: I1dd69d6176cf29bc557aec28a5903eb1788338c1
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Removed multiple occurence of sita from Makefile
Arthur Philpott [Fri, 12 Apr 2013 13:32:31 +0000 (08:32 -0500)]
gpu: ion: Removed multiple occurence of sita from Makefile

After Decoupling the DMM TILER driver from DRM the
extra occurence of sita had to be removed.

Change-Id: Iaeebf52c6874bfa5204dfb5aad0a4a40c33e51f2
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agogpu: ion: Tiler functionality added
Dandawate Saket [Fri, 28 Jun 2013 02:15:43 +0000 (19:15 -0700)]
gpu: ion: Tiler functionality added

Tiler functionality added for the DSSCOMP module

Change-Id: I1dd69d6176cf29bc557aec28a5903eb1788338c1
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Configuration changes
Dandawate Saket [Fri, 28 Jun 2013 01:46:30 +0000 (18:46 -0700)]
gpu: ion: Configuration changes

Added configuration changes to include all
dependencies needed by Tiler and enable by default

Change-Id: I6f7377b8caac991c046cb03ddbe1815101a5f3bd
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: Fixes for ion_alloc_tiler
Sundar Raman [Wed, 17 Apr 2013 19:14:53 +0000 (14:14 -0500)]
gpu: ion: Fixes for ion_alloc_tiler

1) New ION does not allow len=0. Workaround by passing size as -1
2) New ION calls map_dma as part of ion_alloc. This does not work well
for ion_alloc_tiler because the map_dma requires tiler_info to be present
as part of priv_virt. Workaround by passing tiler_info ptr to flags and
insert it into priv_virt field in heap allocate api
3) Misc fixes for allocation and sg list

Change-Id: I90336f8b741d6d8f523fbb15223dbb651b672b06
Signed-off-by: Sundar Raman <a0393242@ti.com>
8 years agoion: gpu: cleanup: remove unnecessary tracking of sg_table
Sundar Raman [Wed, 17 Apr 2013 17:17:50 +0000 (12:17 -0500)]
ion: gpu: cleanup: remove unnecessary tracking of sg_table

Change-Id: I27b421b493d5102825b66c87b4ddeac5060712fb
Signed-off-by: Sundar Raman <a0393242@ti.com>
8 years agogpu: ion: Fix linking issue after enabling ion
Sundar Raman [Fri, 12 Apr 2013 14:35:43 +0000 (09:35 -0500)]
gpu: ion: Fix linking issue after enabling ion

Fix linking issue with ion.

Change-Id: I294fcd865d1cd9ca7b9ae3fc7441debb380e2fb9
Signed-off-by: Sundar Raman <a0393242@ti.com>
8 years agogpu: ion: Migration to device tree
Dandawate Saket [Thu, 27 Jun 2013 20:31:12 +0000 (13:31 -0700)]
gpu: ion: Migration to device tree

Adding support to move to device tree module introduced in kernel K3.8

Change-Id: I6c55e0f21ad92e731afbe9d1e264042362994c0e
Signed-off-by: Sundar Raman <a0393242@ti.com>
Signed-off-by: Dandawate Saket <dsaket@ti.com>
8 years agogpu: ion: omap: Rename OMAP_ION_HEAP_SYSTEM_HEAP enum
David Schleef [Tue, 10 Jul 2012 18:37:52 +0000 (13:37 -0500)]
gpu: ion: omap: Rename OMAP_ION_HEAP_SYSTEM_HEAP enum

Rename OMAP_ION_HEAP_SYSTEM_HEAP to OMAP_ION_HEAP_SYSTEM

Change-Id: I5ce8e22ed3616099d99d721ac2326d6f60062e6d
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
8 years agogpu: ion: omap: Add OMAP_ION_HEAP_SYSTEM_HEAP enum
David Schleef [Fri, 6 Jul 2012 03:17:18 +0000 (20:17 -0700)]
gpu: ion: omap: Add OMAP_ION_HEAP_SYSTEM_HEAP enum

So that it can be used for compiling the PVR driver, even though
the system heap won't actually be used.

Change-Id: I790e6e1245d7a4e1ec031fb314e0498cc6170897
Signed-off-by: David Schleef <ds@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
8 years agogpu: ion: omap: add apis to register and export ion buffers from a pvr fd
Sundar Raman [Fri, 5 Apr 2013 20:08:53 +0000 (15:08 -0500)]
gpu: ion: omap: add apis to register and export ion buffers from a pvr fd

Exporting omap_ion_register_pvr_export through ion. This is needed since
PVR is built as a module as the abstraction uses an exported function
pointer.

omap_ion_share_fd_to_buffers api is added which retrieves the ion handles
from the pvr fd and calls ion_share on the ion handles to return the
shared buffers. The requestor can then call ion_import using its own ion
client to get its own ion handles.

Note that this functionality is intended to be reworked majorly as part of
gralloc's migration to dma buf functionality in new ION framework.

Change-Id: I89fd1aedadd26c3c6561f784cfd3316afd4fe389
Signed-off-by: Sundar Raman <a0393242@ti.com>
8 years agogpu: ion: export needed functions for PVR SGX
Rogelio Garcia [Fri, 25 May 2012 20:11:48 +0000 (15:11 -0500)]
gpu: ion: export needed functions for PVR SGX

Make ion symbols visible to kernel modules. The SGX DDK
in modular form requires these symbols to be exported.

The reason for the code movement of ion structs is due to
EXPORT_SYMBOL’s requirement that the storage size of all
function parameters is known. This is so that the kernel can
sanity-check the size of data structures at module load time.

Ported to 3.8 ION by Sundar Raman<sunds@ti.com>

Change-Id: I52a4136ed47d83097c4c76e384ce11cd80ef3858
Signed-off-by: Rodrigo Obregon <robregon@ti.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
8 years agogpu: ion: Add omap support to ion
Rebecca Schultz Zavin [Mon, 21 May 2012 15:50:39 +0000 (21:20 +0530)]
gpu: ion: Add omap support to ion

Add omap support to ion

Porting from K3.4 to 3.8 by Sundar Raman<sunds@ti.com>

Change-Id: If4c3cf0ebd8216babdd2ed95bf1b51254744f3a8
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Varadarajan, Charulatha <charu@ti.com>
Signed-off-by: Raman, Sundar <sunds@ti.com>
8 years agoMerge branch 'p-ti-linux-3.8.y-video' into p-ti-android-3.8.y-video
Praneeth Bajjuri [Fri, 12 Jul 2013 21:55:37 +0000 (16:55 -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:
  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>
8 years agoOMAPDSS: DISPC: Force L3_2 CD to NOSLEEP when dispc module is active
Devaraj Rangasamy [Mon, 15 Apr 2013 18:17:43 +0000 (13:17 -0500)]
OMAPDSS: DISPC: Force L3_2 CD to NOSLEEP when dispc module is active

It has been identified that L3_2 CD is idling and not responding to the traffic
initiated by initiators. As per errata i740 worakaround, ISS-L3_2 noidle
constraint should be in place when ISS is effective.

But random hangs are observed if DSS-L3_2 is not enabled, and this patch is
a temporary workaround till actual issue is rootcaused and fixed.

Change-Id: Ida7e4d38916b6ef1a3ff429bca24d6b252d923cd
Signed-off-by: Arthur Philpott <arthur.philpott@ti.com>
8 years agoOMAPDSS: DSS: Fix for mask query in manager blank api
Sunita Nadampalli [Mon, 13 May 2013 17:25:34 +0000 (12:25 -0500)]
OMAPDSS: DSS: Fix for mask query in manager blank api

Change-Id: I8978cc1f80451b62bd06f8297471e077b677f5e0
Signed-off-by: Sunita Nadampalli <sunitan@ti.com>