diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-25 17:52:05 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-03-10 09:59:30 +0100 |
| commit | 844285317c90910ab6e467b358df697f70e21417 (patch) | |
| tree | 73158e038b20fab6626e06dcc0aafb11b0d512f5 | |
| parent | drm/i915: Fix struct_mutex deadlock due to merge fumble (diff) | |
| download | linux-844285317c90910ab6e467b358df697f70e21417.tar.xz linux-844285317c90910ab6e467b358df697f70e21417.zip | |
drm: Remove redundant code in the getencoder ioctl
When enabling atomic state object for this ioctl in
commit abd69c55dd8f1f71b33b8c6165217f4329db8f25
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>
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 927f3445ff38..62f485c952e8 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -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); |