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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 90166C433EF for ; Fri, 10 Sep 2021 03:18:23 +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 3B29361074 for ; Fri, 10 Sep 2021 03:18:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3B29361074 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 DD9CF6E964; Fri, 10 Sep 2021 03:18:22 +0000 (UTC) Received: from us-smtp-delivery-44.mimecast.com (us-smtp-delivery-44.mimecast.com [207.211.30.44]) by gabe.freedesktop.org (Postfix) with ESMTPS id EF3006E964 for ; Fri, 10 Sep 2021 03:18:20 +0000 (UTC) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-wJ0qQai9N1O1ocOXdT78MQ-1; Thu, 09 Sep 2021 23:18:16 -0400 X-MC-Unique: wJ0qQai9N1O1ocOXdT78MQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4EBFC362F9; Fri, 10 Sep 2021 03:18:15 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (unknown [10.64.0.157]) by smtp.corp.redhat.com (Postfix) with ESMTP id F1407100EBC1; Fri, 10 Sep 2021 03:18:10 +0000 (UTC) From: Dave Airlie To: intel-gfx@lists.freedesktop.org Cc: jani.nikula@linux.intel.com, Dave Airlie , Jani Nikula Date: Fri, 10 Sep 2021 13:17:27 +1000 Message-Id: <20210910031741.3292388-12-airlied@gmail.com> In-Reply-To: <20210910031741.3292388-1-airlied@gmail.com> References: <20210910031741.3292388-1-airlied@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=airlied@gmail.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: gmail.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="US-ASCII" Subject: [Intel-gfx] [PATCH 11/25] drm/i915: split audio functions from display vtable 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" From: Dave Airlie These are only used internally in the audio code Reviewed-by: Jani Nikula Signed-off-by: Dave Airlie --- drivers/gpu/drm/i915/display/intel_audio.c | 24 +++++++++++----------- drivers/gpu/drm/i915/i915_drv.h | 19 +++++++++++------ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_audio.c b/drivers/gpu/drm/i= 915/display/intel_audio.c index 532237588511..f539826c0424 100644 --- a/drivers/gpu/drm/i915/display/intel_audio.c +++ b/drivers/gpu/drm/i915/display/intel_audio.c @@ -848,8 +848,8 @@ void intel_audio_codec_enable(struct intel_encoder *enc= oder, =20 =09connector->eld[6] =3D drm_av_sync_delay(connector, adjusted_mode) / 2; =20 -=09if (dev_priv->display.audio_codec_enable) -=09=09dev_priv->display.audio_codec_enable(encoder, +=09if (dev_priv->audio_funcs.audio_codec_enable) +=09=09dev_priv->audio_funcs.audio_codec_enable(encoder, =09=09=09=09=09=09 crtc_state, =09=09=09=09=09=09 conn_state); =20 @@ -893,8 +893,8 @@ void intel_audio_codec_disable(struct intel_encoder *en= coder, =09enum port port =3D encoder->port; =09enum pipe pipe =3D crtc->pipe; =20 -=09if (dev_priv->display.audio_codec_disable) -=09=09dev_priv->display.audio_codec_disable(encoder, +=09if (dev_priv->audio_funcs.audio_codec_disable) +=09=09dev_priv->audio_funcs.audio_codec_disable(encoder, =09=09=09=09=09=09 old_crtc_state, =09=09=09=09=09=09 old_conn_state); =20 @@ -922,17 +922,17 @@ void intel_audio_codec_disable(struct intel_encoder *= encoder, void intel_init_audio_hooks(struct drm_i915_private *dev_priv) { =09if (IS_G4X(dev_priv)) { -=09=09dev_priv->display.audio_codec_enable =3D g4x_audio_codec_enable; -=09=09dev_priv->display.audio_codec_disable =3D g4x_audio_codec_disable; +=09=09dev_priv->audio_funcs.audio_codec_enable =3D g4x_audio_codec_enable; +=09=09dev_priv->audio_funcs.audio_codec_disable =3D g4x_audio_codec_disabl= e; =09} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) { -=09=09dev_priv->display.audio_codec_enable =3D ilk_audio_codec_enable; -=09=09dev_priv->display.audio_codec_disable =3D ilk_audio_codec_disable; +=09=09dev_priv->audio_funcs.audio_codec_enable =3D ilk_audio_codec_enable; +=09=09dev_priv->audio_funcs.audio_codec_disable =3D ilk_audio_codec_disabl= e; =09} else if (IS_HASWELL(dev_priv) || DISPLAY_VER(dev_priv) >=3D 8) { -=09=09dev_priv->display.audio_codec_enable =3D hsw_audio_codec_enable; -=09=09dev_priv->display.audio_codec_disable =3D hsw_audio_codec_disable; +=09=09dev_priv->audio_funcs.audio_codec_enable =3D hsw_audio_codec_enable; +=09=09dev_priv->audio_funcs.audio_codec_disable =3D hsw_audio_codec_disabl= e; =09} else if (HAS_PCH_SPLIT(dev_priv)) { -=09=09dev_priv->display.audio_codec_enable =3D ilk_audio_codec_enable; -=09=09dev_priv->display.audio_codec_disable =3D ilk_audio_codec_disable; +=09=09dev_priv->audio_funcs.audio_codec_enable =3D ilk_audio_codec_enable; +=09=09dev_priv->audio_funcs.audio_codec_disable =3D ilk_audio_codec_disabl= e; =09} } =20 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_dr= v.h index 8930bf2db226..1ba94dee683e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -364,6 +364,15 @@ struct intel_color_funcs { =09void (*read_luts)(struct intel_crtc_state *crtc_state); }; =20 +struct intel_audio_funcs { +=09void (*audio_codec_enable)(struct intel_encoder *encoder, +=09=09=09=09 const struct intel_crtc_state *crtc_state, +=09=09=09=09 const struct drm_connector_state *conn_state); +=09void (*audio_codec_disable)(struct intel_encoder *encoder, +=09=09=09=09 const struct intel_crtc_state *old_crtc_state, +=09=09=09=09 const struct drm_connector_state *old_conn_state); +}; + struct drm_i915_display_funcs { =09void (*get_cdclk)(struct drm_i915_private *dev_priv, =09=09=09 struct intel_cdclk_config *cdclk_config); @@ -386,12 +395,7 @@ struct drm_i915_display_funcs { =09=09=09 struct intel_crtc *crtc); =09void (*commit_modeset_enables)(struct intel_atomic_state *state); =09void (*commit_modeset_disables)(struct intel_atomic_state *state); -=09void (*audio_codec_enable)(struct intel_encoder *encoder, -=09=09=09=09 const struct intel_crtc_state *crtc_state, -=09=09=09=09 const struct drm_connector_state *conn_state); -=09void (*audio_codec_disable)(struct intel_encoder *encoder, -=09=09=09=09 const struct intel_crtc_state *old_crtc_state, -=09=09=09=09 const struct drm_connector_state *old_conn_state); + =09void (*fdi_link_train)(struct intel_crtc *crtc, =09=09=09 const struct intel_crtc_state *crtc_state); =09void (*hpd_irq_setup)(struct drm_i915_private *dev_priv); @@ -977,6 +981,9 @@ struct drm_i915_private { =09/* Display internal color functions */ =09struct intel_color_funcs color_funcs; =20 +=09/* Display internal audio functions */ +=09struct intel_audio_funcs audio_funcs; + =09/* PCH chipset type */ =09enum intel_pch pch_type; =09unsigned short pch_id; --=20 2.31.1