drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's
Subsystems (4)
PATCH 1/2 drm/vmwgfx: Return 0 when gmrid::get_node runs out of ID's
From: Deepak Rawat <[email protected]>
If it's not a system error and get_node implementation accommodate the buffer object then it should return 0 with memm::mm_node set to NULL.
v2: Test for id != -ENOMEM instead of id == -ENOSPC.
--- drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c +1 -1
@@ -57,7 +57,7 @@ static int vmw_gmrid_man_get_node(struct ttm_mem_type_manager *man, id =ida_alloc_max (&gman->gmr_ida, gman->max_gmr_ids -1 ,GFP_KERNEL );if (id <0 ) -return id; +return (id != -ENOMEM ?0 : id);spin_lock (&gman->lock);
Signature · 1 line
2.19.0.rc1
PATCH 2/2 drm/vmwgfx: Don't double-free the mode stored in par->set_mode
From: Thomas Zimmermann <[email protected]>
When calling vmw_fb_set_par(), the mode stored in par->set_mode gets free'd twice. The first free is in vmw_fb_kms_detach(), the second is near the end of vmw_fb_set_par() under the name of 'old_mode'. The mode-setting code only works correctly if the mode doesn't actually change. Removing 'old_mode' in favor of using par->set_mode directly fixes the problem.
--- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +3 -9
@@ -564,11 +564,9 @@ static int vmw_fb_set_par(struct fb_info *info)0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 , DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_PVSYNC) }; -struct drm_display_mode *old_mode;struct drm_display_mode *mode;int ret; - old_mode = par->set_mode; mode =drm_mode_duplicate (vmw_priv->dev, &new_mode);if (!mode) {DRM_ERROR ("Could not create new fb mode.\n" );
@@ -579,11 +577,7 @@ static int vmw_fb_set_par(struct fb_info *info) mode->vdisplay = var->yres;vmw_guess_mode_timing (mode); -if (old_mode &&drm_mode_equal (old_mode, mode)) { -drm_mode_destroy (vmw_priv->dev, mode); - mode = old_mode; - old_mode =NULL ; - }else if (!vmw_kms_validate_mode_vram (vmw_priv, +if (!vmw_kms_validate_mode_vram (vmw_priv, mode->hdisplay *DIV_ROUND_UP (var->bits_per_pixel,8 ), mode->vdisplay)) {
@@ -620,8 +614,8 @@ static int vmw_fb_set_par(struct fb_info *info)schedule_delayed_work (&par->local_work,0 ); out_unlock: -if (old_mode) -drm_mode_destroy (vmw_priv->dev, old_mode); +if (par->set_mode) +drm_mode_destroy (vmw_priv->dev, par->set_mode); par->set_mode = mode;mutex_unlock (&par->bo_mutex);
Signature · 1 line
2.19.0.rc1