From patchwork Thu Oct 23 18:50:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 5142711 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 47166C11AC for ; Thu, 23 Oct 2014 18:51:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 862D8201FB for ; Thu, 23 Oct 2014 18:51:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A7EFF201EF for ; Thu, 23 Oct 2014 18:51:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 22C136E505; Thu, 23 Oct 2014 11:51:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-pd0-f177.google.com (mail-pd0-f177.google.com [209.85.192.177]) by gabe.freedesktop.org (Postfix) with ESMTP id CC0C66E4FE for ; Thu, 23 Oct 2014 11:51:16 -0700 (PDT) Received: by mail-pd0-f177.google.com with SMTP id v10so1514865pde.36 for ; Thu, 23 Oct 2014 11:51:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:subject:date:message-id:in-reply-to:references; bh=7tuoRGBhwuY9dnXuxEM8METlYUekh7sG+U/oqu/O5Rs=; b=Ggu4g8T2IaXDuNmm76g6bKPgqslh4W4gQJ8746zmxZY7bKSkHXgzP2f5Wno837jbn7 h+vOByQDwIvrDuNfqRgRDowgQ7yukXAy7bscoNXVHvigZrEBsTNmizUa9lmBgYbEvoAU +Gqz7NXHC56Vzj46Uaa+b95bxoKsUYObcvvQwiVepW5HOwinhP/oQKeStmwMz9YoyG4o CNgKbSxod4LYE2kum3TejtOVWonb6+6fMrFVyoczzA0EPW5QGBlb/c0PUZdegO00bv1v meoQKntyT0HF495a9sjgP3CNny+O3JtZEAmddEF1Cqaa+2MbjEW8rBWf72z/vYgx+RDJ /PMw== X-Received: by 10.68.204.233 with SMTP id lb9mr6799723pbc.25.1414090275620; Thu, 23 Oct 2014 11:51:15 -0700 (PDT) Received: from jbarnes-t420.intel.com (c-67-161-37-189.hsd1.ca.comcast.net. [67.161.37.189]) by mx.google.com with ESMTPSA id yk3sm2096713pbb.60.2014.10.23.11.51.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Oct 2014 11:51:15 -0700 (PDT) From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Thu, 23 Oct 2014 11:50:45 -0700 Message-Id: <1414090247-28930-4-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414090247-28930-1-git-send-email-jbarnes@virtuousgeek.org> References: <1414090247-28930-1-git-send-email-jbarnes@virtuousgeek.org> Subject: [Intel-gfx] [PATCH 4/6] drm/i915: check for audio and infoframe changes across mode sets X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 If these change (e.g. after a modeset following a fastboot), we need to do a full mode set. 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 e031ee8..235933a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11479,6 +11479,16 @@ static int intel_crtc_set_config(struct drm_mode_set *set) if (ret) goto fail; + if (to_intel_crtc(set->crtc)->new_config->has_audio != + to_intel_crtc(set->crtc)->config.has_audio) + config->mode_changed = true; + + /* Force mode sets for any infoframe stuff */ + if (to_intel_crtc(set->crtc)->new_config->has_infoframe || + to_intel_crtc(set->crtc)->config.has_infoframe) + config->mode_changed = true; + + if (config->mode_changed) { ret = intel_set_mode_pipes(set->crtc, set->mode, set->x, set->y, set->fb,