drm/vmwgfx: Turn on DRIVER_ATOMIC flag

Now that the legacy path has been tested, turn on the
DRIVER_ATOMIC flag so user mode driver can start going through
the Atomic path.

Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
This commit is contained in:
Sinclair Yeh 2017-03-31 10:16:22 -07:00
parent b0119cb922
commit f7c478be0a
4 changed files with 3 additions and 4 deletions

View File

@ -898,6 +898,8 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
goto out_no_fifo; goto out_no_fifo;
DRM_INFO("DX: %s\n", dev_priv->has_dx ? "yes." : "no."); DRM_INFO("DX: %s\n", dev_priv->has_dx ? "yes." : "no.");
DRM_INFO("Atomic: %s\n",
(dev->driver->driver_features & DRIVER_ATOMIC) ? "yes" : "no");
snprintf(host_log, sizeof(host_log), "vmwgfx: %s-%s", snprintf(host_log, sizeof(host_log), "vmwgfx: %s-%s",
VMWGFX_REPO, VMWGFX_GIT_VERSION); VMWGFX_REPO, VMWGFX_GIT_VERSION);
@ -1510,7 +1512,7 @@ static const struct file_operations vmwgfx_driver_fops = {
static struct drm_driver driver = { static struct drm_driver driver = {
.driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER, DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC,
.load = vmw_driver_load, .load = vmw_driver_load,
.unload = vmw_driver_unload, .unload = vmw_driver_unload,
.lastclose = vmw_lastclose, .lastclose = vmw_lastclose,

View File

@ -390,7 +390,6 @@ static const struct drm_crtc_helper_funcs vmw_ldu_crtc_helper_funcs = {
.prepare = vmw_ldu_crtc_helper_prepare, .prepare = vmw_ldu_crtc_helper_prepare,
.commit = vmw_ldu_crtc_helper_commit, .commit = vmw_ldu_crtc_helper_commit,
.disable = vmw_ldu_crtc_helper_disable, .disable = vmw_ldu_crtc_helper_disable,
.mode_set = drm_helper_crtc_mode_set,
.mode_set_nofb = vmw_ldu_crtc_mode_set_nofb, .mode_set_nofb = vmw_ldu_crtc_mode_set_nofb,
.atomic_check = vmw_du_crtc_atomic_check, .atomic_check = vmw_du_crtc_atomic_check,
.atomic_begin = vmw_du_crtc_atomic_begin, .atomic_begin = vmw_du_crtc_atomic_begin,

View File

@ -574,7 +574,6 @@ static const struct drm_crtc_helper_funcs vmw_sou_crtc_helper_funcs = {
.prepare = vmw_sou_crtc_helper_prepare, .prepare = vmw_sou_crtc_helper_prepare,
.commit = vmw_sou_crtc_helper_commit, .commit = vmw_sou_crtc_helper_commit,
.disable = vmw_sou_crtc_helper_disable, .disable = vmw_sou_crtc_helper_disable,
.mode_set = drm_helper_crtc_mode_set,
.mode_set_nofb = vmw_sou_crtc_mode_set_nofb, .mode_set_nofb = vmw_sou_crtc_mode_set_nofb,
.atomic_check = vmw_du_crtc_atomic_check, .atomic_check = vmw_du_crtc_atomic_check,
.atomic_begin = vmw_du_crtc_atomic_begin, .atomic_begin = vmw_du_crtc_atomic_begin,

View File

@ -1203,7 +1203,6 @@ static const struct drm_crtc_helper_funcs vmw_stdu_crtc_helper_funcs = {
.prepare = vmw_stdu_crtc_helper_prepare, .prepare = vmw_stdu_crtc_helper_prepare,
.commit = vmw_stdu_crtc_helper_commit, .commit = vmw_stdu_crtc_helper_commit,
.disable = vmw_stdu_crtc_helper_disable, .disable = vmw_stdu_crtc_helper_disable,
.mode_set = drm_helper_crtc_mode_set,
.mode_set_nofb = vmw_stdu_crtc_mode_set_nofb, .mode_set_nofb = vmw_stdu_crtc_mode_set_nofb,
.atomic_check = vmw_du_crtc_atomic_check, .atomic_check = vmw_du_crtc_atomic_check,
.atomic_begin = vmw_du_crtc_atomic_begin, .atomic_begin = vmw_du_crtc_atomic_begin,