From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.9 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY 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 23B4DC433EF for ; Wed, 8 Sep 2021 11:31:01 +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 D932E600D0 for ; Wed, 8 Sep 2021 11:31:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D932E600D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5D9BC6E192; Wed, 8 Sep 2021 11:31:00 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE6886E192 for ; Wed, 8 Sep 2021 11:30:59 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10100"; a="200660279" X-IronPort-AV: E=Sophos;i="5.85,277,1624345200"; d="scan'208";a="200660279" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 04:30:59 -0700 X-IronPort-AV: E=Sophos;i="5.85,277,1624345200"; d="scan'208";a="547686891" Received: from mdoerbec-mobl1.ger.corp.intel.com (HELO localhost) ([10.249.33.106]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 04:30:57 -0700 From: Jani Nikula To: Dave Airlie , intel-gfx@lists.freedesktop.org Cc: Dave Airlie In-Reply-To: <20210908003944.2972024-2-airlied@gmail.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20210908003944.2972024-1-airlied@gmail.com> <20210908003944.2972024-2-airlied@gmail.com> Date: Wed, 08 Sep 2021 14:30:54 +0300 Message-ID: <87k0jr5moh.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Intel-gfx] [PATCH 01/21] drm/i915/pm: drop get_fifo_size vfunc. 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" On Wed, 08 Sep 2021, Dave Airlie wrote: > From: Dave Airlie > > The i845_update_wm code was always calling the i845 variant, > and the i9xx_update_wm had only a choice between i830 and i9xx > paths, hardly worth the vfunc overhead. > > Signed-off-by: Dave Airlie Reviewed-by: Jani Nikula > --- > drivers/gpu/drm/i915/i915_drv.h | 2 -- > drivers/gpu/drm/i915/intel_pm.c | 20 +++++++++++--------- > 2 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index be2392bbcecc..6511ec674c23 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -330,8 +330,6 @@ struct drm_i915_display_funcs { > const struct intel_cdclk_config *cdclk_config, > enum pipe pipe); > int (*bw_calc_min_cdclk)(struct intel_atomic_state *state); > - int (*get_fifo_size)(struct drm_i915_private *dev_priv, > - enum i9xx_plane_id i9xx_plane); > int (*compute_pipe_wm)(struct intel_atomic_state *state, > struct intel_crtc *crtc); > int (*compute_intermediate_wm)(struct intel_atomic_state *state, > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c > index cfc41f8fa74a..d9993eb3730d 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -2347,7 +2347,10 @@ static void i9xx_update_wm(struct intel_crtc *unused_crtc) > else > wm_info = &i830_a_wm_info; > > - fifo_size = dev_priv->display.get_fifo_size(dev_priv, PLANE_A); > + if (DISPLAY_VER(dev_priv) == 2) > + fifo_size = i830_get_fifo_size(dev_priv, PLANE_A); > + else > + fifo_size = i9xx_get_fifo_size(dev_priv, PLANE_A); > crtc = intel_get_crtc_for_plane(dev_priv, PLANE_A); > if (intel_crtc_active(crtc)) { > const struct drm_display_mode *pipe_mode = > @@ -2374,7 +2377,10 @@ static void i9xx_update_wm(struct intel_crtc *unused_crtc) > if (DISPLAY_VER(dev_priv) == 2) > wm_info = &i830_bc_wm_info; > > - fifo_size = dev_priv->display.get_fifo_size(dev_priv, PLANE_B); > + if (DISPLAY_VER(dev_priv) == 2) > + fifo_size = i830_get_fifo_size(dev_priv, PLANE_B); > + else > + fifo_size = i9xx_get_fifo_size(dev_priv, PLANE_B); > crtc = intel_get_crtc_for_plane(dev_priv, PLANE_B); > if (intel_crtc_active(crtc)) { > const struct drm_display_mode *pipe_mode = > @@ -2490,7 +2496,7 @@ static void i845_update_wm(struct intel_crtc *unused_crtc) > pipe_mode = &crtc->config->hw.pipe_mode; > planea_wm = intel_calculate_wm(pipe_mode->crtc_clock, > &i845_wm_info, > - dev_priv->display.get_fifo_size(dev_priv, PLANE_A), > + i845_get_fifo_size(dev_priv, PLANE_A), > 4, pessimal_latency_ns); > fwater_lo = intel_uncore_read(&dev_priv->uncore, FW_BLC) & ~0xfff; > fwater_lo |= (3<<8) | planea_wm; > @@ -8054,15 +8060,11 @@ void intel_init_pm(struct drm_i915_private *dev_priv) > dev_priv->display.update_wm = i965_update_wm; > } else if (DISPLAY_VER(dev_priv) == 3) { > dev_priv->display.update_wm = i9xx_update_wm; > - dev_priv->display.get_fifo_size = i9xx_get_fifo_size; > } else if (DISPLAY_VER(dev_priv) == 2) { > - if (INTEL_NUM_PIPES(dev_priv) == 1) { > + if (INTEL_NUM_PIPES(dev_priv) == 1) > dev_priv->display.update_wm = i845_update_wm; > - dev_priv->display.get_fifo_size = i845_get_fifo_size; > - } else { > + else > dev_priv->display.update_wm = i9xx_update_wm; > - dev_priv->display.get_fifo_size = i830_get_fifo_size; > - } > } else { > drm_err(&dev_priv->drm, > "unexpected fall-through in %s\n", __func__); -- Jani Nikula, Intel Open Source Graphics Center