From patchwork Thu Jun 23 12:36:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chix.ding@intel.com X-Patchwork-Id: 9195037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3BFC86075A for ; Thu, 23 Jun 2016 12:37:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B9B128451 for ; Thu, 23 Jun 2016 12:37:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20AD328453; Thu, 23 Jun 2016 12:37:00 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA3D028451 for ; Thu, 23 Jun 2016 12:36:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EECAD6E918; Thu, 23 Jun 2016 12:36:51 +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 ESMTP id E91A26E3AF for ; Thu, 23 Jun 2016 12:36:49 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 23 Jun 2016 05:36:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,516,1459839600"; d="scan'208";a="981829309" Received: from unknown (HELO KJASTRZX-DESK.ger.corp.intel.com) ([10.104.12.166]) by orsmga001.jf.intel.com with ESMTP; 23 Jun 2016 05:36:48 -0700 From: Chi Ding To: yetundex.adebisi@intel.com, maarten.lankhorst@linux.intel.com, ville.syrjala@linux.intel.com, matthew.d.roper@intel.com, intel-gfx@lists.freedesktop.org, isg-gms@eclists.intel.com Date: Thu, 23 Jun 2016 14:36:27 +0200 Message-Id: <1466685388-16504-8-git-send-email-chix.ding@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 In-Reply-To: <1466685388-16504-1-git-send-email-chix.ding@intel.com> References: <1466685388-16504-1-git-send-email-chix.ding@intel.com> Cc: Chi Ding Subject: [Intel-gfx] [RFC 7/8] drm/i915/vlv: Move active watermarks into intel_crtc->wm.active.vlv X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 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-Virus-Scanned: ClamAV using ClamSMTP From: Maarten Lankhorst Previously the active watermarks is saved in intel_crtc->wm_state This commit adds a new field "vlv" into intel_crtc->wm.active and save the active watermarks in it to be consistent with what we do on other platforms. Signed-off-by: Maarten Lankhorst Signed-off-by: Chi Ding --- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_pm.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index ac0124c..8e77adb 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -680,6 +680,7 @@ struct intel_crtc { union { struct intel_pipe_wm ilk; struct skl_pipe_wm skl; + struct vlv_wm_state vlv; } active; /* allow CxSR on this pipe */ diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 04265ea..cc43c1e 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -1229,7 +1229,7 @@ static void vlv_pipe_set_fifo_size(struct intel_crtc *crtc) struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = to_i915(dev); int sprite0_start = 0, sprite1_start = 0, fifo_size = 0; - const struct vlv_wm_state *wm_state = &crtc->wm_state; + const struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; WARN_ON(wm_state->fifo_size[PLANE_CURSOR] != 63); @@ -1311,7 +1311,7 @@ static void vlv_merge_wm(struct drm_device *dev, wm->cxsr = true; for_each_intel_crtc(dev, crtc) { - const struct vlv_wm_state *wm_state = &crtc->wm_state; + const struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; if (!crtc->active) continue; @@ -1330,7 +1330,7 @@ static void vlv_merge_wm(struct drm_device *dev, wm->level = VLV_WM_LEVEL_PM2; for_each_intel_crtc(dev, crtc) { - struct vlv_wm_state *wm_state = &crtc->wm_state; + struct vlv_wm_state *wm_state = &crtc->wm.active.vlv; enum pipe pipe = crtc->pipe; if (!crtc->active) @@ -1357,7 +1357,7 @@ static void vlv_update_wm(struct drm_crtc *crtc) vlv_compute_wm(intel_crtc->config); mutex_lock(&dev_priv->wm.wm_mutex); - intel_crtc->wm_state = intel_crtc->config->wm.vlv.optimal; + intel_crtc->wm.active.vlv = intel_crtc->config->wm.vlv.optimal; vlv_merge_wm(dev, &wm); mutex_unlock(&dev_priv->wm.wm_mutex); @@ -4372,7 +4372,7 @@ void vlv_wm_get_hw_state(struct drm_device *dev) int i = wm_plane_id(plane); crtc = to_intel_crtc(intel_get_crtc_for_pipe(dev, plane->pipe)); - wm_state = &crtc->wm_state; + wm_state = &crtc->wm.active.vlv; switch (plane->base.type) { case DRM_PLANE_TYPE_CURSOR: @@ -4426,7 +4426,7 @@ void vlv_wm_get_hw_state(struct drm_device *dev) for_each_intel_crtc(dev, crtc) { pipe = crtc->pipe; to_intel_crtc_state(crtc->base.state)->wm.vlv.optimal - = crtc->wm_state; + = crtc->wm.active.vlv; DRM_DEBUG_KMS("Initial watermarks: pipe %c, plane=%d, cursor=%d, sprite0=%d, sprite1=%d\n", pipe_name(pipe), wm->pipe[pipe].primary, wm->pipe[pipe].cursor,