hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Remove dead code from intel_release_load_detect_pipe() 

As we now never attempt to steal a crtc for load detection, we either
set a mode on a new pipe, or change the dpms mode on an existing pipe.
Never both, so we can simplify the code slightly.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Chris Wilson 2011-04-21 09:32:11 +01:00 committed by Keith Packard
parent 6492711d05
commit 0622a53c60
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/drm/i915/intel_display.c
View File

@ -5577,16 +5577,14 @@ void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder,
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private; struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
if (old->load_detect_temp) { if (old->load_detect_temp) {
encoder->crtc = NULL;
connector->encoder = NULL; connector->encoder = NULL;
crtc->enabled = drm_helper_crtc_in_use(crtc);
drm_helper_disable_unused_functions(dev); drm_helper_disable_unused_functions(dev);
return;
} }
/* Switch crtc and encoder back off if necessary */ /* Switch crtc and encoder back off if necessary */
if (crtc->enabled && old->dpms_mode != DRM_MODE_DPMS_ON) { if (old->dpms_mode != DRM_MODE_DPMS_ON) {
if (encoder->crtc == crtc) encoder_funcs->dpms(encoder, old->dpms_mode);
encoder_funcs->dpms(encoder, old->dpms_mode);
crtc_funcs->dpms(crtc, old->dpms_mode); crtc_funcs->dpms(crtc, old->dpms_mode);
} }
} }