Commit 50a4a926 authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/audio: Use u32* for ELD

Make the eld pointer u32* so we don't have to do super
ugly casting in the code itself.

Cc: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221026170150.2654-12-ville.syrjala@linux.intel.com
parent 0234cda2
...@@ -333,7 +333,7 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder, ...@@ -333,7 +333,7 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder,
{ {
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
struct drm_connector *connector = conn_state->connector; struct drm_connector *connector = conn_state->connector;
const u8 *eld = connector->eld; const u32 *eld = (const u32 *)connector->eld;
int eld_buffer_size, len, i; int eld_buffer_size, len, i;
u32 tmp; u32 tmp;
...@@ -342,11 +342,10 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder, ...@@ -342,11 +342,10 @@ static void g4x_audio_codec_enable(struct intel_encoder *encoder,
intel_de_write(i915, G4X_AUD_CNTL_ST, tmp); intel_de_write(i915, G4X_AUD_CNTL_ST, tmp);
eld_buffer_size = g4x_eld_buffer_size(i915); eld_buffer_size = g4x_eld_buffer_size(i915);
len = min(drm_eld_size(eld) / 4, eld_buffer_size); len = min(drm_eld_size(connector->eld) / 4, eld_buffer_size);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
intel_de_write(i915, G4X_HDMIW_HDMIEDID, intel_de_write(i915, G4X_HDMIW_HDMIEDID, eld[i]);
*((const u32 *)eld + i));
for (; i < eld_buffer_size; i++) for (; i < eld_buffer_size; i++)
intel_de_write(i915, G4X_HDMIW_HDMIEDID, 0); intel_de_write(i915, G4X_HDMIW_HDMIEDID, 0);
...@@ -614,7 +613,7 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder, ...@@ -614,7 +613,7 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
struct drm_connector *connector = conn_state->connector; struct drm_connector *connector = conn_state->connector;
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder; enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
const u8 *eld = connector->eld; const u32 *eld = (const u32 *)connector->eld;
int eld_buffer_size, len, i; int eld_buffer_size, len, i;
u32 tmp; u32 tmp;
...@@ -643,11 +642,10 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder, ...@@ -643,11 +642,10 @@ static void hsw_audio_codec_enable(struct intel_encoder *encoder,
intel_de_write(i915, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder), tmp); intel_de_write(i915, HSW_AUD_DIP_ELD_CTRL(cpu_transcoder), tmp);
eld_buffer_size = hsw_eld_buffer_size(i915, cpu_transcoder); eld_buffer_size = hsw_eld_buffer_size(i915, cpu_transcoder);
len = min(drm_eld_size(eld) / 4, eld_buffer_size); len = min(drm_eld_size(connector->eld) / 4, eld_buffer_size);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
intel_de_write(i915, HSW_AUD_EDID_DATA(cpu_transcoder), intel_de_write(i915, HSW_AUD_EDID_DATA(cpu_transcoder), eld[i]);
*((const u32 *)eld + i));
for (; i < eld_buffer_size; i++) for (; i < eld_buffer_size; i++)
intel_de_write(i915, HSW_AUD_EDID_DATA(cpu_transcoder), 0); intel_de_write(i915, HSW_AUD_EDID_DATA(cpu_transcoder), 0);
...@@ -749,9 +747,9 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, ...@@ -749,9 +747,9 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder,
struct drm_i915_private *i915 = to_i915(encoder->base.dev); struct drm_i915_private *i915 = to_i915(encoder->base.dev);
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_connector *connector = conn_state->connector; struct drm_connector *connector = conn_state->connector;
const u32 *eld = (const u32 *)connector->eld;
enum pipe pipe = crtc->pipe; enum pipe pipe = crtc->pipe;
enum port port = encoder->port; enum port port = encoder->port;
const u8 *eld = connector->eld;
int eld_buffer_size, len, i; int eld_buffer_size, len, i;
struct ilk_audio_regs regs; struct ilk_audio_regs regs;
u32 tmp; u32 tmp;
...@@ -781,11 +779,10 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, ...@@ -781,11 +779,10 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder,
intel_de_write(i915, regs.aud_cntl_st, tmp); intel_de_write(i915, regs.aud_cntl_st, tmp);
eld_buffer_size = ilk_eld_buffer_size(i915, pipe); eld_buffer_size = ilk_eld_buffer_size(i915, pipe);
len = min(drm_eld_size(eld) / 4, eld_buffer_size); len = min(drm_eld_size(connector->eld) / 4, eld_buffer_size);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
intel_de_write(i915, regs.hdmiw_hdmiedid, intel_de_write(i915, regs.hdmiw_hdmiedid, eld[i]);
*((const u32 *)eld + i));
for (; i < eld_buffer_size; i++) for (; i < eld_buffer_size; i++)
intel_de_write(i915, regs.hdmiw_hdmiedid, 0); intel_de_write(i915, regs.hdmiw_hdmiedid, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment