From patchwork Tue Jan 7 21:50:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 3450131 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 07A049F2E9 for ; Tue, 7 Jan 2014 21:50:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 30A2120120 for ; Tue, 7 Jan 2014 21:50:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 6BEAC200F4 for ; Tue, 7 Jan 2014 21:50:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 860A1FAC99; Tue, 7 Jan 2014 13:50:54 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from alt-proxy6.mail.unifiedlayer.com (alt-proxy6.mail.unifiedlayer.com [66.147.245.65]) by gabe.freedesktop.org (Postfix) with SMTP id 156D5FAC99 for ; Tue, 7 Jan 2014 13:50:53 -0800 (PST) Received: (qmail 22755 invoked by uid 0); 7 Jan 2014 21:50:52 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy14.mail.unifiedlayer.com with SMTP; 7 Jan 2014 21:50:52 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=Message-Id:Date:Subject:To:From; bh=y9cHl3da6t4EY14slt3L/UJKER7Qc52tZwp0bcuUWJM=; b=PK/HNlPU/nT24yxjUTrF7kZetdgUtV2nOmwYKMFc2iVDCpzHy0oxCmd/Nz4hY7clzHFc2krogqiCMQU4RfOBGAtxwkjBZpSWe8OL+bqNaSJDFNWdTachEwSyizeVkGAI; Received: from [67.161.37.189] (port=57338 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (UNKNOWN:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1W0eY0-0004Gt-EW for intel-gfx@lists.freedesktop.org; Tue, 07 Jan 2014 14:50:52 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Tue, 7 Jan 2014 13:50:49 -0800 Message-Id: <1389131449-2928-1-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH] drm/i915: check modeset state after a pipe_set_base if using fastboot 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 Otherwise we won't check the state until the next DPMS transition, which may never happen. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e6a447d..2bd978a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10124,6 +10124,16 @@ static int intel_crtc_set_config(struct drm_mode_set *set) ret = intel_pipe_set_base(set->crtc, set->x, set->y, set->fb); + /* + * In the fastboot case this may be our only check of the + * state after boot. It would be better to only do it on + * the first update, but we don't have a nice way of doing that + * (and really, set_config isn't used much for high freq page + * flipping, so increasing its cost here shouldn't be a big + * deal). + */ + if (i915_fastboot && ret == 0) + intel_modeset_check_state(set->crtc->dev); } if (ret) {