From patchwork Fri Feb 19 19:16:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Souza, Jose" X-Patchwork-Id: 12096063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BC5FC433E0 for ; Fri, 19 Feb 2021 19:14:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C35364EB4 for ; Fri, 19 Feb 2021 19:14:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C35364EB4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B72816EB8A; Fri, 19 Feb 2021 19:14:51 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAB416EB8A for ; Fri, 19 Feb 2021 19:14:50 +0000 (UTC) IronPort-SDR: /WmtRpwXeL6F6tVVkKDuUk1FRcjP/fxWaMbiG4BTipqq9nWA+72DnTKTxHoVJ2VttR/Yeadp1K 3t/GFujJH8sw== X-IronPort-AV: E=McAfee;i="6000,8403,9900"; a="248002239" X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="248002239" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2021 11:14:50 -0800 IronPort-SDR: dAWcPgLa0hIpEG7xBQOVOLbMLTHsXTLLk0QXDvaW24eEe1lFIyMUBrzlzEXR7pdy6/cDxtSZdI X7JpUuLxmYAQ== X-IronPort-AV: E=Sophos;i="5.81,189,1610438400"; d="scan'208";a="365303252" Received: from kkkoney-mobl3.amr.corp.intel.com (HELO josouza-mobl2.intel.com) ([10.251.152.169]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2021 11:14:48 -0800 From: =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= To: intel-gfx@lists.freedesktop.org Date: Fri, 19 Feb 2021 11:16:23 -0800 Message-Id: <20210219191623.163775-1-jose.souza@intel.com> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915/display: Read planes watermarks during initial state readout X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Without this readout all plane watermarks will be kept at zero in the initial state readount causing two problems. All active planes will always have their watermarks programmed again, even if what firmware programmed matches with the sanitized state during driver takeover. State mismatch errors in disabled planes as watermarks will erroneous match with the calculated state if firmware left watermark registers with non-zero values. Cc: Ville Syrjälä Signed-off-by: José Roberto de Souza --- drivers/gpu/drm/i915/display/intel_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index d0da88751c72..14fba4411be7 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -13620,6 +13620,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev) drm_calc_timestamping_constants(&slave->base, &slave_crtc_state->hw.adjusted_mode); } + + skl_pipe_wm_get_hw_state(crtc, &crtc_state->wm.skl.optimal); } }