diff options
| author | Keith Packard <keithp@keithp.com> | 2018-06-26 14:05:31 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-07-03 13:06:30 -0400 |
| commit | 4a11f66e4690f9e94dc61cb264f5ef78dbdb255a (patch) | |
| tree | 96ba326eaa40eacc799ddd54c1e3d7cc61e20a46 | |
| parent | 2faf4cef8bcf9bb2034a27219a656ea7221afc6c (diff) | |
xf86-video-modesetting: Don't enable UNIVERSAL_PLANES separately
We don't want universal_planes unless we're using atomic APIs for
modesetting, and the kernel already enables universal_planes
automatically when atomic is enabled.
If we enable universal_planes when we're not using atomic, then we
won't have selected a plane for each crtc, and this will break lease
creation which requires planes for each output when universal_planes
is enabled.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | hw/xfree86/drivers/modesetting/driver.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c index 6f4637254..a4912a971 100644 --- a/hw/xfree86/drivers/modesetting/driver.c +++ b/hw/xfree86/drivers/modesetting/driver.c @@ -1034,8 +1034,7 @@ PreInit(ScrnInfoPtr pScrn, int flags) #endif } - ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1); - ret |= drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 1); + ret = drmSetClientCap(ms->fd, DRM_CLIENT_CAP_ATOMIC, 1); ms->atomic_modeset = (ret == 0); ms->kms_has_modifiers = FALSE; |