diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-12 10:13:33 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2017-07-13 09:50:39 +0200 |
| commit | bdc362f631e2ac140e2b5ddfe5ba9705a5b1a6a0 (patch) | |
| tree | dd1d8afe520f4a41f7879046610716e231c49e52 /drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |
| parent | 2d705c0b367622d382d80c38240b3069c19f4eeb (diff) | |
| download | lwn-bdc362f631e2ac140e2b5ddfe5ba9705a5b1a6a0.tar.gz lwn-bdc362f631e2ac140e2b5ddfe5ba9705a5b1a6a0.zip | |
drm/vmwgfx: Make check_modeset() use the new atomic iterator macros.
I don't think the checking of resources in this function is very
atomic-like, but it should definitely not use a macro that's about
to be removed.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: VMware Graphics <linux-graphics-maintainer@vmware.com>
Cc: Sinclair Yeh <syeh@vmware.com>
Cc: Thomas Hellstrom <thellstrom@vmware.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170712081344.25495-6-maarten.lankhorst@linux.intel.com
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[mlankhorst: Make function static (danvet)]
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 1cd67b10a0d9..620180df1303 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -1527,7 +1527,7 @@ err_out: * RETURNS * Zero for success or -errno */ -int +static int vmw_kms_atomic_check_modeset(struct drm_device *dev, struct drm_atomic_state *state) { @@ -1536,8 +1536,7 @@ vmw_kms_atomic_check_modeset(struct drm_device *dev, struct vmw_private *dev_priv = vmw_priv(dev); int i; - - for_each_crtc_in_state(state, crtc, crtc_state, i) { + for_each_new_crtc_in_state(state, crtc, crtc_state, i) { unsigned long requested_bb_mem = 0; if (dev_priv->active_display_unit == vmw_du_screen_target) { |