diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-04-12 17:42:01 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-12 17:42:01 +0100 |
| commit | 173fa4eccc39b04fbc0b569fabac6dbcec33507a (patch) | |
| tree | 5d73a6eb84c6f029f0934c0548b641471a23decb /include | |
| parent | 19e5c4e72c7287491f0da64e26b6b7175942f502 (diff) | |
| parent | 490aa60ee7e884febf4818234d5c97669665db9a (diff) | |
| download | linux-173fa4eccc39b04fbc0b569fabac6dbcec33507a.tar.gz | |
Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
* 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung: drm/exynos: fixed exynos broken ioctl drm/exynos: fix to pointer manager member of struct exynos_drm_subdrv drm/exynos: fix struct for operation callback functions to driver name drm/exynos: use define instead of default_win member in struct mixer_context drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR drm/exynos: remove unused codes in hdmi and mixer drm/exynos: remove unnecessary type conversion of hdmi and mixer drm/exynos: add format list of plane drm/exynos: fixed duplicated page allocation bug. drm/exynos: fixed page align and code clean.
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm/exynos_drm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/drm/exynos_drm.h b/include/drm/exynos_drm.h index 3963116083ae..e478de4e5d56 100644 --- a/include/drm/exynos_drm.h +++ b/include/drm/exynos_drm.h @@ -85,7 +85,7 @@ struct drm_exynos_gem_mmap { struct drm_exynos_vidi_connection { unsigned int connection; unsigned int extensions; - uint64_t *edid; + uint64_t edid; }; struct drm_exynos_plane_set_zpos { @@ -96,7 +96,8 @@ struct drm_exynos_plane_set_zpos { /* memory type definitions. */ enum e_drm_exynos_gem_mem_type { /* Physically Non-Continuous memory. */ - EXYNOS_BO_NONCONTIG = 1 << 0 + EXYNOS_BO_NONCONTIG = 1 << 0, + EXYNOS_BO_MASK = EXYNOS_BO_NONCONTIG }; #define DRM_EXYNOS_GEM_CREATE 0x00 |