linux-stable.git/drivers/gpu/drm/exynos, branch linux-3.4.y

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-2.6-samsung into drm-fixes

2012-04-27T07:20:35+00:00

From Inki Dae:

this patch set fixes gem allocation and mapping issue between user space and
physical memory region.

* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-2.6-samsung:
  drm/exynos: added missed vm area region mapping type.
  drm/exynos: fixed exynos_drm_gem_map_pages bug.
  drm/exynos: fixed duplicatd memory allocation bug.

drm/exynos: added missed vm area region mapping type.

2012-04-23T11:31:54+00:00

with this patch, if the memory region is physically non-continuous
then VM_MIXEDMAP is set to vm->vm_flags otherwise VM_PFNMAP.
we had missed this flag setting.

Signed-off-by: Inki Dae 
Signed-off-by: Kyungmin Park

drm/exynos: fixed exynos_drm_gem_map_pages bug.

2012-04-23T11:31:45+00:00

this patch fixes the problem that the physical memory region to be mapped
to user space could be exceeded. if page fault address was placed at between
buffer start and end then memory region to be mapped would be exceeded.

Signed-off-by: Inki Dae 
Signed-off-by: Kyungmin Park

drm/exynos: fixed duplicatd memory allocation bug.

2012-04-23T11:31:20+00:00

the gem was already allocated at gem allocation time but is allocated
at page fault handler so this patch fixes the problem that gem was
allocated one more time.

Signed-off-by: Inki Dae 
Signed-off-by: Kyungmin Park

VM: add "vm_mmap()" helper function

2012-04-21T00:29:13+00:00

This continues the theme started with vm_brk() and vm_munmap():
vm_mmap() does the same thing as do_mmap(), but additionally does the
required VM locking.

This uninlines (and rewrites it to be clearer) do_mmap(), which sadly
duplicates it in mm/mmap.c and mm/nommu.c.  But that way we don't have
to export our internal do_mmap_pgoff() function.

Some day we hopefully don't have to export do_mmap() either, if all
modular users can become the simpler vm_mmap() instead.  We're actually
very close to that already, with the notable exception of the (broken)
use in i810, and a couple of stragglers in binfmt_elf.

Signed-off-by: Linus Torvalds

drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv

2012-04-12T05:51:27+00:00

The struct exynos_drm_manager has to exist for exynos drm sub driver
using encoder and connector. If it isn't NULL to member of struct
exynos_drm_subdrv, will create encoder and connector else will not. And
the is_local member also doesn't need.

Signed-off-by: Joonyoung Shim 
Signed-off-by: Kyungmin Park 
Signed-off-by: Inki Dae

drm/exynos: fix struct for operation callback functions to driver name

2012-04-12T05:51:26+00:00

The mixer driver and hdmi driver have each operation callback functions
and they is registered to hdmi common driver. Their struct names in hdmi
common driver include display, manager and overlay. It confuses to
appear whose operation and two driver cannot register same operation
callback functions at the same time. Use their struct names to driver
name.

Signed-off-by: Joonyoung Shim 
Signed-off-by: Kyungmin Park 
Signed-off-by: Inki Dae

drm/exynos: use define instead of default_win member in struct mixer_context

2012-04-12T05:51:24+00:00

The default_win member in struct mixer_context isn't change its value
after initialized to 0, so it's better using to define.

Signed-off-by: Joonyoung Shim 
Signed-off-by: Kyungmin Park 
Signed-off-by: Inki Dae

drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR

2012-04-12T05:51:21+00:00

HDMI_OVERLAY_NUMBER is specific of mixer driver and be used "windows
layer" term in exynos user manaual, so rename it.

Signed-off-by: Joonyoung Shim 
Signed-off-by: Kyungmin Park 
Signed-off-by: Inki Dae

drm/exynos: remove unused codes in hdmi and mixer

2012-04-12T05:51:18+00:00

Some members in struct mixer_context aren't used and the define
HDMI_OVERLAY_NUMBER is unused in hdmi driver, remove them.

Signed-off-by: Joonyoung Shim 
Signed-off-by: Kyungmin Park 
Signed-off-by: Inki Dae