Skip to content

Commit 172a1ae

Browse files
committed
drm/i915: don't call dpms funcs after set_mode
... because our current set_mode implementation doesn't bother to adjust for the dpms state, we just forcefully update it. So stop pretending that we're better than we are and rip out this extranous call. Note that this totally confuses userspace, because the exposed connector property isn't actually updated ... Reviewed-by: Jesse Barnes <[email protected]> Signed-off-by: Daniel Vetter <[email protected]>
1 parent 46b6f81 commit 172a1ae

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

drivers/gpu/drm/i915/intel_display.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7296,7 +7296,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
72967296
struct drm_mode_set save_set;
72977297
struct intel_set_config *config;
72987298
int ret;
7299-
int i;
73007299

73017300
BUG_ON(!set);
73027301
BUG_ON(!set->crtc);
@@ -7360,15 +7359,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set)
73607359
ret = -EINVAL;
73617360
goto fail;
73627361
}
7363-
7364-
if (set->crtc->enabled) {
7365-
DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
7366-
for (i = 0; i < set->num_connectors; i++) {
7367-
DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
7368-
drm_get_connector_name(set->connectors[i]));
7369-
set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
7370-
}
7371-
}
73727362
} else if (config->fb_changed) {
73737363
ret = intel_pipe_set_base(set->crtc,
73747364
set->x, set->y, set->fb);

0 commit comments

Comments
 (0)