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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6D4B5C433F5 for ; Thu, 21 Oct 2021 10:27:11 +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 2C72360F57 for ; Thu, 21 Oct 2021 10:27:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2C72360F57 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 97C896E3EC; Thu, 21 Oct 2021 10:27:10 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id BB6846E3EC for ; Thu, 21 Oct 2021 10:27:09 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="215917140" X-IronPort-AV: E=Sophos;i="5.87,169,1631602800"; d="scan'208";a="215917140" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2021 03:26:37 -0700 X-IronPort-AV: E=Sophos;i="5.87,169,1631602800"; d="scan'208";a="484144711" Received: from ssuryana-mobl.ger.corp.intel.com (HELO localhost) ([10.249.45.34]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2021 03:26:35 -0700 From: Jani Nikula To: Ville Syrjala , intel-gfx@lists.freedesktop.org In-Reply-To: <20211020223339.669-2-ville.syrjala@linux.intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20211020223339.669-1-ville.syrjala@linux.intel.com> <20211020223339.669-2-ville.syrjala@linux.intel.com> Date: Thu, 21 Oct 2021 13:26:32 +0300 Message-ID: <87r1cen06f.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH 1/4] drm/i915: Move function prototypes to the correct header 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 Thu, 21 Oct 2021, Ville Syrjala wrote: > From: Ville Syrj=C3=A4l=C3=A4 > > A bunch of function prototypes were left behind when the > plane/crtc code got reshuffled to new files. Move the > prototypes as well. Reviewed-by: Jani Nikula > > Signed-off-by: Ville Syrj=C3=A4l=C3=A4 > --- > drivers/gpu/drm/i915/display/intel_crtc.h | 5 +++++ > drivers/gpu/drm/i915/display/intel_psr.c | 2 +- > drivers/gpu/drm/i915/display/intel_sprite.h | 4 ---- > 3 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_crtc.h b/drivers/gpu/drm/= i915/display/intel_crtc.h > index a5ae997581aa..22363fbbc925 100644 > --- a/drivers/gpu/drm/i915/display/intel_crtc.h > +++ b/drivers/gpu/drm/i915/display/intel_crtc.h > @@ -9,10 +9,13 @@ > #include >=20=20 > enum pipe; > +struct drm_display_mode; > struct drm_i915_private; > struct intel_crtc; > struct intel_crtc_state; >=20=20 > +int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mod= e, > + int usecs); > u32 intel_crtc_max_vblank_count(const struct intel_crtc_state *crtc_stat= e); > int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe); > struct intel_crtc_state *intel_crtc_state_alloc(struct intel_crtc *crtc); > @@ -21,5 +24,7 @@ void intel_crtc_state_reset(struct intel_crtc_state *cr= tc_state, > u32 intel_crtc_get_vblank_counter(struct intel_crtc *crtc); > void intel_crtc_vblank_on(const struct intel_crtc_state *crtc_state); > void intel_crtc_vblank_off(const struct intel_crtc_state *crtc_state); > +void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_sta= te); > +void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); >=20=20 > #endif > diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i= 915/display/intel_psr.c > index 49c2dfbd4055..ccffe05784d3 100644 > --- a/drivers/gpu/drm/i915/display/intel_psr.c > +++ b/drivers/gpu/drm/i915/display/intel_psr.c > @@ -28,13 +28,13 @@ >=20=20 > #include "i915_drv.h" > #include "intel_atomic.h" > +#include "intel_crtc.h" > #include "intel_de.h" > #include "intel_display_types.h" > #include "intel_dp_aux.h" > #include "intel_hdmi.h" > #include "intel_psr.h" > #include "intel_snps_phy.h" > -#include "intel_sprite.h" > #include "skl_universal_plane.h" >=20=20 > /** > diff --git a/drivers/gpu/drm/i915/display/intel_sprite.h b/drivers/gpu/dr= m/i915/display/intel_sprite.h > index c085eb87705c..4f63e4967731 100644 > --- a/drivers/gpu/drm/i915/display/intel_sprite.h > +++ b/drivers/gpu/drm/i915/display/intel_sprite.h > @@ -27,14 +27,10 @@ struct intel_plane_state; > #define VBLANK_EVASION_TIME_US 100 > #endif >=20=20 > -int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mod= e, > - int usecs); > struct intel_plane *intel_sprite_plane_create(struct drm_i915_private *d= ev_priv, > enum pipe pipe, int plane); > int intel_sprite_set_colorkey_ioctl(struct drm_device *dev, void *data, > struct drm_file *file_priv); > -void intel_pipe_update_start(const struct intel_crtc_state *new_crtc_sta= te); > -void intel_pipe_update_end(struct intel_crtc_state *new_crtc_state); > int intel_plane_check_src_coordinates(struct intel_plane_state *plane_st= ate); > int chv_plane_check_rotation(const struct intel_plane_state *plane_state= ); --=20 Jani Nikula, Intel Open Source Graphics Center