On Thu, 6 Sep 2012 22:08:34 +0200
Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> ... 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 ...
>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
> drivers/gpu/drm/i915/intel_display.c | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 0973797..805324d 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -7236,7 +7236,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);
> @@ -7300,15 +7299,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);
Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
