Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5d958ef authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

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



This is not necessary after the below commit.

commit a0211bb4
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: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent ce22dba9

drivers/gpu/drm/i915/intel_display.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

	}



	if (ret == -EDEADLK) {

		drm_modeset_backoff(ctx);
@@ -13003,7 +13001,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) 
	}



out_config:

	if (state)

	drm_atomic_state_free(state);



	intel_set_config_free(config);