mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-21 01:32:47 +07:00
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:
parent
ce22dba92d
commit
e5d958ef42
@ -9860,10 +9860,8 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
|
||||
fail:
|
||||
intel_crtc->new_enabled = crtc->state->enable;
|
||||
fail_unlock:
|
||||
if (state) {
|
||||
drm_atomic_state_free(state);
|
||||
state = NULL;
|
||||
}
|
||||
drm_atomic_state_free(state);
|
||||
state = NULL;
|
||||
|
||||
if (ret == -EDEADLK) {
|
||||
drm_modeset_backoff(ctx);
|
||||
@ -13003,8 +13001,7 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
|
||||
}
|
||||
|
||||
out_config:
|
||||
if (state)
|
||||
drm_atomic_state_free(state);
|
||||
drm_atomic_state_free(state);
|
||||
|
||||
intel_set_config_free(config);
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user