From patchwork Wed May 18 10:59:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lisovskiy, Stanislav" X-Patchwork-Id: 12853494 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 56424C433F5 for ; Wed, 18 May 2022 10:59:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AA12010E02D; Wed, 18 May 2022 10:59:42 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 220FB10E02D for ; Wed, 18 May 2022 10:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652871581; x=1684407581; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=hvr6y8QljWTVEl0cJdXadu7Eu8WF4RkdfCeKz4xGgN4=; b=lNEVKuNlswyRyQJSxVM8QuFp3Rho2MGBrNJIOG71JcJDYJ3WZnAeu1CJ cfGI1XIO+zjFkIHYuD8bpfaK7K8JIFr1ko26NTS8QrQVFZfNRXtb4Pl7Z N4HQE4vCTnV+AazrSoetglsQivH6ciY5Vhzx47akhu4l9zsy7A22ObMom 0kHZSw6ym12aBh/ZtoTtQqI6Qm1lk1FDrAdtMGVObe6sHd36ZwEuqaLwy rJKXp3EMklQKkq9koNdOmW7EZqCecdxeluRo9TVJXqaDtN/tI/WfSXEzr nmbhiUS4dLXtUnkD6wKK5x3hxiugKhmGUN0PuByu5UF5HWEulONLYlqE5 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10350"; a="271560952" X-IronPort-AV: E=Sophos;i="5.91,234,1647327600"; d="scan'208";a="271560952" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 May 2022 03:59:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,234,1647327600"; d="scan'208";a="639206560" Received: from unknown (HELO slisovsk-Lenovo-ideapad-720S-13IKB.fi.intel.com) ([10.237.72.65]) by fmsmga004.fm.intel.com with ESMTP; 18 May 2022 03:59:37 -0700 From: Stanislav Lisovskiy To: intel-gfx@lists.freedesktop.org Date: Wed, 18 May 2022 13:59:46 +0300 Message-Id: <20220518105946.28179-1-stanislav.lisovskiy@intel.com> X-Mailer: git-send-email 2.24.1.485.gad05a3d8e5 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] drm/i915: Write zero wms if we disable planes for icl+ 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" Otherwise we seem to get FIFO underruns. It is being disabled anyway, so kind of logical to write those as zeroes, even if disabling is temporary. Signed-off-by: Stanislav Lisovskiy --- .../drm/i915/display/skl_universal_plane.c | 2 +- drivers/gpu/drm/i915/intel_pm.c | 46 +++++++++++++++++++ drivers/gpu/drm/i915/intel_pm.h | 2 + 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index caa03324a733..c0251189c042 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -633,7 +633,7 @@ icl_plane_disable_arm(struct intel_plane *plane, if (icl_is_hdr_plane(dev_priv, plane_id)) intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id), 0); - skl_write_plane_wm(plane, crtc_state); + skl_write_zero_plane_wm(plane, crtc_state); intel_psr2_disable_plane_sel_fetch(plane, crtc_state); intel_de_write_fw(dev_priv, PLANE_CTL(pipe, plane_id), 0); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index ee0047fdc95d..2470c037bfae 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5885,6 +5885,52 @@ void skl_write_plane_wm(struct intel_plane *plane, PLANE_NV12_BUF_CFG(pipe, plane_id), ddb_y); } +void skl_write_zero_plane_wm(struct intel_plane *plane, + const struct intel_crtc_state *crtc_state) +{ + struct drm_i915_private *dev_priv = to_i915(plane->base.dev); + int level, max_level = ilk_wm_max_level(dev_priv); + enum plane_id plane_id = plane->id; + enum pipe pipe = plane->pipe; + struct skl_pipe_wm pipe_wm; + const struct skl_ddb_entry *ddb = + &crtc_state->wm.skl.plane_ddb[plane_id]; + const struct skl_ddb_entry *ddb_y = + &crtc_state->wm.skl.plane_ddb_y[plane_id]; + + for (level = 0; level <= max_level; level++) { + pipe_wm.planes[plane_id].wm[level].blocks = 0; + pipe_wm.planes[plane_id].wm[level].lines = 0; + } + + pipe_wm.planes[plane_id].trans_wm.blocks = 0; + pipe_wm.planes[plane_id].trans_wm.lines = 0; + + for (level = 0; level <= max_level; level++) + skl_write_wm_level(dev_priv, PLANE_WM(pipe, plane_id, level), + skl_plane_wm_level(&pipe_wm, plane_id, level)); + + skl_write_wm_level(dev_priv, PLANE_WM_TRANS(pipe, plane_id), + skl_plane_trans_wm(&pipe_wm, plane_id)); + + if (HAS_HW_SAGV_WM(dev_priv)) { + const struct skl_plane_wm *wm = &pipe_wm.planes[plane_id]; + + skl_write_wm_level(dev_priv, PLANE_WM_SAGV(pipe, plane_id), + &wm->sagv.wm0); + skl_write_wm_level(dev_priv, PLANE_WM_SAGV_TRANS(pipe, plane_id), + &wm->sagv.trans_wm); + } + + skl_ddb_entry_write(dev_priv, + PLANE_BUF_CFG(pipe, plane_id), ddb); + + if (DISPLAY_VER(dev_priv) < 11) + skl_ddb_entry_write(dev_priv, + PLANE_NV12_BUF_CFG(pipe, plane_id), ddb_y); +} + + void skl_write_cursor_wm(struct intel_plane *plane, const struct intel_crtc_state *crtc_state) { diff --git a/drivers/gpu/drm/i915/intel_pm.h b/drivers/gpu/drm/i915/intel_pm.h index 50604cf7398c..fb0ac4f143ab 100644 --- a/drivers/gpu/drm/i915/intel_pm.h +++ b/drivers/gpu/drm/i915/intel_pm.h @@ -61,6 +61,8 @@ bool skl_wm_level_equals(const struct skl_wm_level *l1, bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb, const struct skl_ddb_entry *entries, int num_entries, int ignore_idx); +void skl_write_zero_plane_wm(struct intel_plane *plane, + const struct intel_crtc_state *crtc_state); void skl_write_plane_wm(struct intel_plane *plane, const struct intel_crtc_state *crtc_state); void skl_write_cursor_wm(struct intel_plane *plane,