diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-10-07 07:06:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-10-07 07:06:33 -0400 |
| commit | a5a0fc67435599d9d787a8d7153967a70fed968e (patch) | |
| tree | fd0015e62bd9b66af78e98e0c0a084596bfcaec4 /include/drm | |
| parent | 0dbe23218333bad3e75148f090fe670d8ca41ad6 (diff) | |
| parent | 768c3059d87876ce124dafc40078718dc85cec65 (diff) | |
Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next
Inki writes:
"this patch set updates exynos drm framework and includes minor fixups.
and this pull request except hdmi device tree support patch set posted
by Rahul Sharma because that includes media side patch so for this
patch set, we may have git pull one more time in addition, if we get
an agreement with media guys. for this patch, you can refer to below link,
http://comments.gmane.org/gmane.comp.video.dri.devel/74504
this pull request adds hdmi device tree support
and includes related patch set such as disabling of hdmi internal
interrupt, suppport for platform variants for hdmi and mixer,
support to disable video processor based on platform type and
removal of drm common platform data. as you know, this patch
set was delayed because it included an media side patch. so for this,
we got an ack from v4l2-based hdmi driver author, Tomasz Stanislawski."
* 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung: (34 commits)
drm: exynos: hdmi: remove drm common hdmi platform data struct
drm: exynos: hdmi: add support for exynos5 hdmi
drm: exynos: hdmi: replace is_v13 with version check in hdmi
drm: exynos: hdmi: add support for exynos5 mixer
drm: exynos: hdmi: add support to disable video processor in mixer
drm: exynos: hdmi: add support for platform variants for mixer
drm: exynos: hdmi: add support for exynos5 hdmiphy
drm: exynos: hdmi: add support for exynos5 ddc
drm: exynos: remove drm hdmi platform data struct
drm: exynos: hdmi: turn off HPD interrupt in HDMI chip
drm: exynos: hdmi: use s5p-hdmi platform data
drm: exynos: hdmi: fix interrupt handling
drm: exynos: hdmi: support for platform variants
media: s5p-hdmi: add HPD GPIO to platform data
drm/exynos: fix kcalloc size of g2d cmdlist node
drm/exynos: fix to calculate CRTC shown via screen
drm/exynos: fix display power call issue.
drm/exynos: add platform_device_id table and driver data for drm fimd
drm/exynos: Fix potential NULL pointer dereference
drm/exynos: support drm_wait_vblank feature for VIDI
...
Conflicts:
include/drm/exynos_drm.h
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/exynos_drm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h index 0fcc185bf147..3c13a3a4b158 100644 --- a/include/drm/exynos_drm.h +++ b/include/drm/exynos_drm.h | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | 30 | ||
| 31 | #include <uapi/drm/exynos_drm.h> | 31 | #include <uapi/drm/exynos_drm.h> |
| 32 | 32 | ||
| 33 | |||
| 34 | /** | 33 | /** |
| 35 | * A structure for lcd panel information. | 34 | * A structure for lcd panel information. |
| 36 | * | 35 | * |