From patchwork Fri Jan 17 20:17:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paulo Zanoni X-Patchwork-Id: 3507321 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 105179F2E9 for ; Fri, 17 Jan 2014 20:17:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A36220122 for ; Fri, 17 Jan 2014 20:17:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3F2B1200FF for ; Fri, 17 Jan 2014 20:17:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 222BDFD0F7; Fri, 17 Jan 2014 12:17:56 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qe0-f45.google.com (mail-qe0-f45.google.com [209.85.128.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 66825FD0F7 for ; Fri, 17 Jan 2014 12:17:54 -0800 (PST) Received: by mail-qe0-f45.google.com with SMTP id x7so1919211qeu.32 for ; Fri, 17 Jan 2014 12:17:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0bPj6S5hKy1VYkWWth4UkRl45ly3NYg9eHWHixtUZrE=; b=ulHEXT5ErtUcEnUSAoCroweHSSaSoFBrLJJH4+qEHpi6xv6ib0Vlt09cbX7dHnFMCA MC/20hVstER/Qp3eEpIShLt0jAMe4EiKqlG4Gr84YHUFGXcyHQ2aJ0o56wEVfQPly0ea xQdGvdqHlZqRfz7BHdUwyVdRdRKMWyouPkwBzfoww5VEpz311pP3gHtwQs8JVT4kfLWb ZRr+ljR0r0frtcTjN2e4O8aSqk4VVaXLaHB4ARIigVCIEbbFHb1z+7xX4wgoYVLIv3wI lN1+poY/qR14IEFrAKH6qZ5zJV/+I04CMEg9PPW616SJZzcq3VIifBEZxRy9cWW/cmpn DVbg== X-Received: by 10.224.97.67 with SMTP id k3mr6767887qan.17.1389989871882; Fri, 17 Jan 2014 12:17:51 -0800 (PST) Received: from localhost.localdomain ([177.96.29.155]) by mx.google.com with ESMTPSA id j7sm15452604qas.13.2014.01.17.12.17.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Jan 2014 12:17:50 -0800 (PST) From: Paulo Zanoni To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Jan 2014 18:17:42 -0200 Message-Id: <1389989862-1904-1-git-send-email-przanoni@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: References: Cc: Paulo Zanoni Subject: [Intel-gfx] [PATCH 3/6] drm/i915: reset eDP timestamps on resume X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Paulo Zanoni The eDP code records a few timestamps containing the last time we took some actions, because we need to wait before doing some other actions. The problem is that if we store a timestamp when suspending and then look at it when resuming, we'll ignore the unknown amount of time we actually were suspended. This happens with the panel power cycle delay: it's 500ms on my machine, and it's delaying the resume sequence by 200ms due to a timestamp we recorded before suspending. This patch should solve this problem by resetting the timestamps. v2: - Fix the madatory jiffies/milliseconds bug. v3: - We can use drm_connector->reset after Daniel's recent refactor. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/intel_dp.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 55c43cf..001fb06 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -3302,12 +3302,34 @@ void intel_dp_encoder_destroy(struct drm_encoder *encoder) kfree(intel_dig_port); } +void intel_dp_reset(struct drm_connector *connector) +{ + struct intel_dp *intel_dp = intel_attached_dp(connector); + unsigned long tmp_jiffies = jiffies; + + if (!is_edp(intel_dp)) + return; + + /* + * Reset everything, otherwise when suspend/resume gets very fast, we + * delay the resume based on the values that were set when we were still + * suspending. + */ + intel_dp->last_power_on = tmp_jiffies - + msecs_to_jiffies(intel_dp->backlight_on_delay); + intel_dp->last_power_cycle = tmp_jiffies - + msecs_to_jiffies(intel_dp->panel_power_cycle_delay); + intel_dp->last_backlight_off = tmp_jiffies - + msecs_to_jiffies(intel_dp->backlight_off_delay); +} + static const struct drm_connector_funcs intel_dp_connector_funcs = { .dpms = intel_connector_dpms, .detect = intel_dp_detect, .fill_modes = drm_helper_probe_single_connector_modes, .set_property = intel_dp_set_property, .destroy = intel_dp_connector_destroy, + .reset = intel_dp_reset, }; static const struct drm_connector_helper_funcs intel_dp_connector_helper_funcs = {