diff options
| author | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:01 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2018-08-12 09:55:10 +0300 |
| commit | 73b383141d296c55bfbc0ce336a4a946627e7780 (patch) | |
| tree | df0840c4ea4bbd5aa453931a594936bd9adab61d /drivers/gpu/drm/exynos/exynos_drm_rotator.c | |
| parent | 627661ced8246c8e833f3bc3817070e934cd79ba (diff) | |
| parent | 91c6e15efc1756b068dc6e945c1626397e60a119 (diff) | |
| download | linux-73b383141d296c55bfbc0ce336a4a946627e7780.tar.xz | |
Merge branch 'for-next' into for-linus
Preparation for 4.19 merge material.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_drm_rotator.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_rotator.c b/drivers/gpu/drm/exynos/exynos_drm_rotator.c index 1a76dd3d52e1..a820a68429b9 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_rotator.c +++ b/drivers/gpu/drm/exynos/exynos_drm_rotator.c @@ -168,9 +168,9 @@ static void rotator_dst_set_transf(struct rot_context *rot, val &= ~ROT_CONTROL_FLIP_MASK; if (rotation & DRM_MODE_REFLECT_X) - val |= ROT_CONTROL_FLIP_HORIZONTAL; - if (rotation & DRM_MODE_REFLECT_Y) val |= ROT_CONTROL_FLIP_VERTICAL; + if (rotation & DRM_MODE_REFLECT_Y) + val |= ROT_CONTROL_FLIP_HORIZONTAL; val &= ~ROT_CONTROL_ROT_MASK; |