diff options
| author | Dave Airlie | 2009-09-02 06:00:11 +0200 |
|---|---|---|
| committer | Dave Airlie | 2009-09-02 06:00:11 +0200 |
| commit | 9c552dd79346f86a3b53e41255c92c6f560b80fb (patch) | |
| tree | d7cc9c5d9987ef2bdf36c821b60b7ebf7eee38d3 /drivers/gpu | |
| parent | drm/kms: add explicit encoder disable function and detach harder. (diff) | |
| download | kernel-qcow2-linux-9c552dd79346f86a3b53e41255c92c6f560b80fb.tar.gz kernel-qcow2-linux-9c552dd79346f86a3b53e41255c92c6f560b80fb.tar.xz kernel-qcow2-linux-9c552dd79346f86a3b53e41255c92c6f560b80fb.zip | |
drm/crtc: fix mismerge of last patch.
We only want to NULL encoder->crtc when it is off.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index eea5e6c4099c..db0237dec6c4 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -278,9 +278,9 @@ void drm_helper_disable_unused_functions(struct drm_device *dev) (*encoder_funcs->disable)(encoder); else (*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF); + /* disconnector encoder from any connector */ + encoder->crtc = NULL; } - /* disconnector encoder from any connector */ - encoder->crtc = NULL; } list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |