]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Simplify error handling in __intel_set_mode()
authorAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Tue, 21 Apr 2015 14:13:07 +0000 (17:13 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 8 May 2015 11:04:02 +0000 (13:04 +0200)
commita21849ff9c9aa4b7bc95ebe84d226a49742eb0cc
tree4c19b406f32b8ce56d82a74d99247bc72490c641
parentd90666511ca4b5649fb2d9597b71a4d417aeb6b8
drm/i915: Simplify error handling in __intel_set_mode()

The remaining parts of the failure path could only be reached if the
allocation of crtc_state_copy would fail. In that case, there is nothing
to undo, so just get rid of the label for error handling and return an
error code immediately.

We also always allocate a pipe_config, even if the pipe is being
disabled, so the remaining part of what was the error/done case can be
simplified a little too.

v2: Ignore return value from drm_plane_helper_update(). (Ander)

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>
drivers/gpu/drm/i915/intel_display.c