diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-01-23 09:32:54 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-01-23 09:33:34 +1000 |
| commit | a04616a30a515e6659c198b82d2925e4aabd3a99 (patch) | |
| tree | 9da86bad5581dbb5f54957cb72bae45f2162b60e /include/uapi/drm | |
| parent | 61ff410faefc97866ba0fd86113d072b1e2acc9d (diff) | |
| parent | c0bf499f6f84634c14cdec0afd1f17ff4121afa2 (diff) | |
| download | linux-a04616a30a515e6659c198b82d2925e4aabd3a99.tar.gz linux-a04616a30a515e6659c198b82d2925e4aabd3a99.tar.bz2 linux-a04616a30a515e6659c198b82d2925e4aabd3a99.zip | |
Merge tag 'exynos-drm-next-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
Change Exynos DRM specific callback function names
- it changes enable and disable callback functions names of
struct exynos_drm_crtc_ops to atomic_enable and atomic_disable
for consistency.
Modify "EXYNOS" prefix to "Exynos"
- "Exynos" name is a regular trademarked name promoted by its
manufacturer, Samsung Electronics Co., Ltd.. This patch
corrects the name.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1579567970-4467-1-git-send-email-inki.dae@samsung.com
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/exynos_drm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/drm/exynos_drm.h b/include/uapi/drm/exynos_drm.h index 45c6582b3df3..a51aa1c618c1 100644 --- a/include/uapi/drm/exynos_drm.h +++ b/include/uapi/drm/exynos_drm.h @@ -394,7 +394,7 @@ struct drm_exynos_ioctl_ipp_commit { #define DRM_IOCTL_EXYNOS_IPP_COMMIT DRM_IOWR(DRM_COMMAND_BASE + \ DRM_EXYNOS_IPP_COMMIT, struct drm_exynos_ioctl_ipp_commit) -/* EXYNOS specific events */ +/* Exynos specific events */ #define DRM_EXYNOS_G2D_EVENT 0x80000000 #define DRM_EXYNOS_IPP_EVENT 0x80000002 |