From: Dave Airlie <airlied@redhat.com>
Date: Mon, 30 Jul 2012 05:15:33 +0000 (+1000)
Subject: Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung... 
X-Git-Tag: next-20120731~40^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2f895fac1e9fb5f59444e07391bfb3da719716f;p=karo-tx-linux.git

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

Inki wrote:

this patch set includes the following:
- update of crtc and plane module.
  . the interface of crtc and plane to control overlay is integrated
    internally. for this some code fixings are added. also this supports
    the exynos specific property or crtc and plane.
- change exynos gem allocation interface.
  . this patch makes non-contiguous memory allocation request allocate pages
    from highmem through alloc_page() with GFP_HIGHUSER_MOVABLE because
    cpu may read garbage data from cache once gpu operation is completed with
    allocated pages.
    shmem_read_mapping_page_gfp() first tries to allocate pages from page
    cache so if pages are alloated from page cache then these pages could
    have valid line and we had faced with this issue.
- add exception codes to vidi module.
  . edid data from user should be allocatd and copied into vidi context and
    also freed with disconnection.
- and code clean.

* 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: (30 commits)
  drm/exynos: fixed exception to page allocation failure
  drm/exynos: use __free_page() to deallocate memory
  drm/exynos: fixed a comment to gem size.
  drm/exynos: removed unnecessary variable
  drm/exynos: do not release memory region from exporter.
  drm/exynos: set buffer type from exporter.
  drm/exynos: use alloc_page() to allocate pages.
  drm/exynos: fixed build warning.
  drm/exynos: fixed edid data setting at vidi connection request
  drm/exynos: check if raw edid data is fake or not for test
  drm/exynos: set edid fake data only for test.
  drm/exynos: removed unnecessary declaration.
  drm/exynos: fix buffer pitch calculation
  drm/exynos: check for null in return value of dma_buf_map_attachment()
  drm/exynos: return NULL if exynos_pages_to_sg fails
  drm/exynos: Use devm_* functions in exynos_mixer.c
  drm/exynos: Use devm_* functions in exynos_hdmi.c
  drm/exynos: Use devm_* functions in exynos_drm_fimd.c
  drm/exynos: Add missing static storage class specifier
  drm/exynos: add property for crtc mode
  ...
---

e2f895fac1e9fb5f59444e07391bfb3da719716f