Commit 84428531 authored Feb 25, 2015 by Daniel Vetter

drm: Remove redundant code in the getencoder ioctl



When enabling atomic state object for this ioctl in

commit abd69c55
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Tue Nov 25 23:50:05 2014 +0100

    drm: Handle atomic state properly in kms getfoo ioctl

I've forgotten to remove this hunk in one of the later revisions.
drm_encoder_get_crtc already does this.

Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <seanpaul@chromium.org>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

parent 3a656b54

drivers/gpu/drm/drm_crtc.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2285,8 +2285,6 @@ int drm_mode_getencoder(struct drm_device dev, void data,
		crtc = drm_encoder_get_crtc(encoder);
		if (crtc)
		enc_resp->crtc_id = crtc->base.id;
		else if (encoder->crtc)
		enc_resp->crtc_id = encoder->crtc->base.id;
		else
		enc_resp->crtc_id = 0;
		drm_modeset_unlock(&dev->mode_config.connection_mutex);