openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: Don't check for NULL before freeing state 

This is not necessary after the below commit.

commit a0211bb482
Author: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Date:   Mon Mar 30 14:05:43 2015 +0300

    drm/atomic: Don't try to free a NULL state

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ander Conselvan de Oliveira 2015-04-21 17:12:57 +03:00 committed by Daniel Vetter
parent ce22dba92d
commit e5d958ef42
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/intel_display.c
View File

@ -9860,10 +9860,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
fail: fail:
intel_crtc->new_enabled = crtc->state->enable; intel_crtc->new_enabled = crtc->state->enable;
fail_unlock: fail_unlock:
if (state) { drm_atomic_state_free(state);
drm_atomic_state_free(state); state = NULL;
state = NULL;
}
if (ret == -EDEADLK) { if (ret == -EDEADLK) {
drm_modeset_backoff(ctx); drm_modeset_backoff(ctx);
@ -13003,8 +13001,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
} }
out_config: out_config:
if (state) drm_atomic_state_free(state);
drm_atomic_state_free(state);
intel_set_config_free(config); intel_set_config_free(config);
return ret; return ret;