diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-07-22 16:56:14 +0300 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-07-22 16:56:14 +0300 |
| commit | cfb7156672dd4de51bcdbc89cfc67c653300f260 (patch) | |
| tree | dfc2d53ea057f425964208c863899b499b9fa08d /drivers/gpu | |
| parent | 5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff) | |
| parent | 7aaddd96d5febcf5b24357a326b3038d49a20532 (diff) | |
| download | linux-cfb7156672dd4de51bcdbc89cfc67c653300f260.tar.xz | |
Merge drm-misc-next-fixes-2019-07-18 into drm-misc-fixes
Picking up 7aaddd96d5f ("drm/modes: Don't apply cmdline's rotation if it wasn't specified")
from drm-misc-next-fixes. It missed the merge window.
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_client_modeset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_client_modeset.c index 56d36779d213..c8922b7cac09 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -859,7 +859,7 @@ bool drm_client_rotation(struct drm_mode_set *modeset, unsigned int *rotation) * simple XOR between the two handle the addition nicely. */ cmdline = &connector->cmdline_mode; - if (cmdline->specified) { + if (cmdline->specified && cmdline->rotation_reflection) { unsigned int cmdline_rest, panel_rest; unsigned int cmdline_rot, panel_rot; unsigned int sum_rot, sum_rest; |