Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 172a1ae1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 46b6f814

drivers/gpu/drm/i915/intel_display.c

+0 −10
Original line number Diff line number Diff line
@@ -7296,7 +7296,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) 
	struct drm_mode_set save_set;

	struct intel_set_config *config;

	int ret;

	int i;



	BUG_ON(!set);

	BUG_ON(!set->crtc);
@@ -7360,15 +7359,6 @@ static int intel_crtc_set_config(struct drm_mode_set *set) 
			ret = -EINVAL;

			goto fail;

		}



		if (set->crtc->enabled) {

			DRM_DEBUG_KMS("Setting connector DPMS state to on\n");

			for (i = 0; i < set->num_connectors; i++) {

				DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,

					      drm_get_connector_name(set->connectors[i]));

				set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);

			}

		}

	} else if (config->fb_changed) {

		ret = intel_pipe_set_base(set->crtc,

					  set->x, set->y, set->fb);