From patchwork Thu Nov 1 15:05:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 10664057 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 42E6A1734 for ; Thu, 1 Nov 2018 15:06:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3287F2BDC8 for ; Thu, 1 Nov 2018 15:06:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26A8B2BF4E; Thu, 1 Nov 2018 15:06:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AE1012BDC8 for ; Thu, 1 Nov 2018 15:06:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1B9856E392; Thu, 1 Nov 2018 15:06:11 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id DC1626E392 for ; Thu, 1 Nov 2018 15:06:09 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Nov 2018 08:06:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,452,1534834800"; d="scan'208";a="82653462" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga007.fm.intel.com with SMTP; 01 Nov 2018 08:06:06 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 01 Nov 2018 17:06:05 +0200 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Date: Thu, 1 Nov 2018 17:05:51 +0200 Message-Id: <20181101150605.18235-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.18.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 00/14] drm/i915: Program SKL+ watermarks/ddb more carefully X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 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" X-Virus-Scanned: ClamAV using ClamSMTP From: Ville Syrjälä First a bunch of cleanups and reordering of the plane register update sequence to make it potentially more atomic, then we move the SKL+ plane wm/ddb programming into the plane update/disable hooks, and finally we change the order in which the planes gets updated to avoid accidental ddb overlaps in case a vblank sneaks in while we're reprogramming the planes (as that could even cause a system hang). There are a few updates to the watermark code as well that started to bug me while doing this. Entire thing available here: git://github.com/vsyrjala/linux.git skl_plane_ddb_wm_update Ville Syrjälä (14): drm/i915: Nuke posting reads from plane update/disable funcs drm/i915: Clean up skl_program_scaler() drm/i915: Remove the PS_PWR_GATE write from skl_program_scaler() drm/i915: Polish the skl+ plane keyval/msk/max register setup drm/i915: Clean up skl+ PLANE_POS vs. scaler handling drm/i915: Reorganize plane register writes to make them more atomic drm/i915: Move single buffered plane register writes to the end drm/i915: Generalize skl_ddb_allocation_overlaps() drm/i915: Introduce crtc_state->update_planes bitmask drm/i915: Pass the new crtc_state to ->disable_plane() drm/i915: Fix latency==0 handling for level 0 watermark on skl+ drm/i915: Remove some useless zeroing on skl+ wm calculations drm/i915: Move ddb/wm programming into plane update/disable hooks on skl+ drm/i915: Commit skl+ planes in an order that avoids ddb overlaps drivers/gpu/drm/i915/i915_debugfs.c | 21 +- drivers/gpu/drm/i915/i915_drv.h | 3 - drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_atomic.c | 1 + drivers/gpu/drm/i915/intel_atomic_plane.c | 102 ++++- drivers/gpu/drm/i915/intel_display.c | 125 +++--- drivers/gpu/drm/i915/intel_display.h | 19 +- drivers/gpu/drm/i915/intel_drv.h | 29 +- drivers/gpu/drm/i915/intel_pm.c | 483 ++++++++++------------ drivers/gpu/drm/i915/intel_sprite.c | 185 +++++---- 10 files changed, 518 insertions(+), 452 deletions(-)