Commit 1b242cee authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/audio: convert to struct intel_display 



Going forward, struct intel_display will be the main display device
structure. Convert intel_audio.[ch] to it, as much as possible
anyway. Do some minor checkpatch fixes while at it.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4ddcc2e704fc6b1592a878c80e15fadd82c63550.1736345025.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent b9ec6793

drivers/gpu/drm/i915/display/intel_audio.c

+212 −201

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/display/intel_audio.h

+7 −7
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ 
#include <linux/types.h>



struct drm_connector_state;

struct drm_i915_private;

struct intel_crtc_state;

struct intel_display;

struct intel_encoder;



void intel_audio_hooks_init(struct drm_i915_private *dev_priv);

void intel_audio_hooks_init(struct intel_display *display);

bool intel_audio_compute_config(struct intel_encoder *encoder,

				struct intel_crtc_state *crtc_state,

				struct drm_connector_state *conn_state);
@@ -25,12 +25,12 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, 
			       const struct drm_connector_state *old_conn_state);

void intel_audio_codec_get_config(struct intel_encoder *encoder,

				  struct intel_crtc_state *crtc_state);

void intel_audio_cdclk_change_pre(struct drm_i915_private *dev_priv);

void intel_audio_cdclk_change_post(struct drm_i915_private *dev_priv);

void intel_audio_cdclk_change_pre(struct intel_display *display);

void intel_audio_cdclk_change_post(struct intel_display *display);

int intel_audio_min_cdclk(const struct intel_crtc_state *crtc_state);

void intel_audio_init(struct drm_i915_private *dev_priv);

void intel_audio_register(struct drm_i915_private *i915);

void intel_audio_deinit(struct drm_i915_private *dev_priv);

void intel_audio_init(struct intel_display *display);

void intel_audio_register(struct intel_display *display);

void intel_audio_deinit(struct intel_display *display);

void intel_audio_sdp_split_update(const struct intel_crtc_state *crtc_state);



#endif /* __INTEL_AUDIO_H__ */

drivers/gpu/drm/i915/display/intel_cdclk.c

+2 −3
Original line number Diff line number Diff line
@@ -2521,7 +2521,6 @@ static void intel_set_cdclk(struct intel_display *display, 
			    const struct intel_cdclk_config *cdclk_config,

			    enum pipe pipe, const char *context)

{

	struct drm_i915_private *dev_priv = to_i915(display->drm);

	struct intel_encoder *encoder;



	if (!intel_cdclk_changed(&display->cdclk.hw, cdclk_config))
@@ -2538,7 +2537,7 @@ static void intel_set_cdclk(struct intel_display *display, 
		intel_psr_pause(intel_dp);

	}



	intel_audio_cdclk_change_pre(dev_priv);

	intel_audio_cdclk_change_pre(display);



	/*

	 * Lock aux/gmbus while we change cdclk in case those
@@ -2568,7 +2567,7 @@ static void intel_set_cdclk(struct intel_display *display, 
		intel_psr_resume(intel_dp);

	}



	intel_audio_cdclk_change_post(dev_priv);

	intel_audio_cdclk_change_post(display);



	if (drm_WARN(display->drm,

		     intel_cdclk_changed(&display->cdclk.hw, cdclk_config),

drivers/gpu/drm/i915/display/intel_display_driver.c

+4 −6
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ void intel_display_driver_early_probe(struct intel_display *display) 
	intel_dkl_phy_init(i915);

	intel_color_init_hooks(display);

	intel_init_cdclk_hooks(display);

	intel_audio_hooks_init(i915);

	intel_audio_hooks_init(display);

	intel_dpll_init_clock_hook(i915);

	intel_init_display_hooks(i915);

	intel_fdi_init_hook(i915);
@@ -546,11 +546,11 @@ void intel_display_driver_register(struct intel_display *display) 
	intel_opregion_register(display);

	intel_acpi_video_register(display);



	intel_audio_init(i915);

	intel_audio_init(display);



	intel_display_driver_enable_user_access(display);



	intel_audio_register(i915);

	intel_audio_register(display);



	intel_display_debugfs_register(i915);
@@ -638,8 +638,6 @@ void intel_display_driver_remove_nogem(struct intel_display *display) 


void intel_display_driver_unregister(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	if (!HAS_DISPLAY(display))

		return;
@@ -654,7 +652,7 @@ void intel_display_driver_unregister(struct intel_display *display) 


	intel_display_driver_disable_user_access(display);



	intel_audio_deinit(i915);

	intel_audio_deinit(display);



	drm_atomic_helper_shutdown(display->drm);

drivers/gpu/drm/xe/display/xe_display.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ void xe_display_fini(struct xe_device *xe) 
	intel_hpd_poll_fini(xe);



	intel_hdcp_component_fini(display);

	intel_audio_deinit(xe);

	intel_audio_deinit(display);

}



void xe_display_register(struct xe_device *xe)