Skip to content

L
linux
Commit f9f682ae authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files
Options

drm/i915/audio: beat some sense into the variable types and names 

Most importantly, "i" need not be the universal variable used for
everything. No functional changes.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 87fcb2ad
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 58 deletions
drivers/gpu/drm/i915/intel_audio.c
View file @ f9f682ae
...@@ -73,20 +73,21 @@ static bool intel_eld_uptodate(struct drm_connector *connector, ...@@ -73,20 +73,21 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
{ {
struct drm_i915_private *dev_priv = connector->dev->dev_private; struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
uint32_t i; uint32_t tmp;
int i;
i = I915_READ(reg_eldv); tmp = I915_READ(reg_eldv);
i &= bits_eldv; tmp &= bits_eldv;
if (!eld[0]) if (!eld[0])
return !i; return !tmp;
if (!i) if (!tmp)
return false; return false;
i = I915_READ(reg_elda); tmp = I915_READ(reg_elda);
i &= ~bits_elda; tmp &= ~bits_elda;
I915_WRITE(reg_elda, i); I915_WRITE(reg_elda, tmp);
for (i = 0; i < eld[2]; i++) for (i = 0; i < eld[2]; i++)
if (I915_READ(reg_edid) != *((uint32_t *)eld + i)) if (I915_READ(reg_edid) != *((uint32_t *)eld + i))
...@@ -102,12 +103,11 @@ static void g4x_write_eld(struct drm_connector *connector, ...@@ -102,12 +103,11 @@ static void g4x_write_eld(struct drm_connector *connector,
struct drm_i915_private *dev_priv = connector->dev->dev_private; struct drm_i915_private *dev_priv = connector->dev->dev_private;
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
uint32_t eldv; uint32_t eldv;
uint32_t len; uint32_t tmp;
uint32_t i; int len, i;
i = I915_READ(G4X_AUD_VID_DID);
if (i == INTEL_AUDIO_DEVBLC || i == INTEL_AUDIO_DEVCL) tmp = I915_READ(G4X_AUD_VID_DID);
if (tmp == INTEL_AUDIO_DEVBLC || tmp == INTEL_AUDIO_DEVCL)
eldv = G4X_ELDV_DEVCL_DEVBLC; eldv = G4X_ELDV_DEVCL_DEVBLC;
else else
eldv = G4X_ELDV_DEVCTG; eldv = G4X_ELDV_DEVCTG;
...@@ -118,22 +118,22 @@ static void g4x_write_eld(struct drm_connector *connector, ...@@ -118,22 +118,22 @@ static void g4x_write_eld(struct drm_connector *connector,
G4X_HDMIW_HDMIEDID)) G4X_HDMIW_HDMIEDID))
return; return;
i = I915_READ(G4X_AUD_CNTL_ST); tmp = I915_READ(G4X_AUD_CNTL_ST);
i &= ~(eldv | G4X_ELD_ADDR); tmp &= ~(eldv | G4X_ELD_ADDR);
len = (i >> 9) & 0x1f; /* ELD buffer size */ len = (tmp >> 9) & 0x1f; /* ELD buffer size */
I915_WRITE(G4X_AUD_CNTL_ST, i); I915_WRITE(G4X_AUD_CNTL_ST, tmp);
if (!eld[0]) if (!eld[0])
return; return;
len = min_t(uint8_t, eld[2], len); len = min_t(int, eld[2], len);
DRM_DEBUG_DRIVER("ELD size %d\n", len); DRM_DEBUG_DRIVER("ELD size %d\n", len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
I915_WRITE(G4X_HDMIW_HDMIEDID, *((uint32_t *)eld + i)); I915_WRITE(G4X_HDMIW_HDMIEDID, *((uint32_t *)eld + i));
i = I915_READ(G4X_AUD_CNTL_ST); tmp = I915_READ(G4X_AUD_CNTL_ST);
i |= eldv; tmp |= eldv;
I915_WRITE(G4X_AUD_CNTL_ST, i); I915_WRITE(G4X_AUD_CNTL_ST, tmp);
} }
static void haswell_write_eld(struct drm_connector *connector, static void haswell_write_eld(struct drm_connector *connector,
...@@ -144,11 +144,10 @@ static void haswell_write_eld(struct drm_connector *connector, ...@@ -144,11 +144,10 @@ static void haswell_write_eld(struct drm_connector *connector,
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
uint32_t eldv; uint32_t eldv;
uint32_t i; uint32_t tmp;
int len; int len, i;
int pipe = to_intel_crtc(crtc)->pipe; enum pipe pipe = to_intel_crtc(crtc)->pipe;
int tmp; enum port port;
int hdmiw_hdmiedid = HSW_AUD_EDID_DATA(pipe); int hdmiw_hdmiedid = HSW_AUD_EDID_DATA(pipe);
int aud_cntl_st = HSW_AUD_DIP_ELD_CTRL(pipe); int aud_cntl_st = HSW_AUD_DIP_ELD_CTRL(pipe);
int aud_config = HSW_AUD_CFG(pipe); int aud_config = HSW_AUD_CFG(pipe);
...@@ -196,28 +195,27 @@ static void haswell_write_eld(struct drm_connector *connector, ...@@ -196,28 +195,27 @@ static void haswell_write_eld(struct drm_connector *connector,
hdmiw_hdmiedid)) hdmiw_hdmiedid))
return; return;
i = I915_READ(aud_cntrl_st2); tmp = I915_READ(aud_cntrl_st2);
i &= ~eldv; tmp &= ~eldv;
I915_WRITE(aud_cntrl_st2, i); I915_WRITE(aud_cntrl_st2, tmp);
if (!eld[0]) if (!eld[0])
return; return;
i = I915_READ(aud_cntl_st); tmp = I915_READ(aud_cntl_st);
i &= ~IBX_ELD_ADDRESS; tmp &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i); I915_WRITE(aud_cntl_st, tmp);
i = (i >> 29) & DIP_PORT_SEL_MASK; /* DIP_Port_Select, 0x1 = PortB */ port = (tmp >> 29) & DIP_PORT_SEL_MASK; /* DIP_Port_Select, 0x1 = PortB */
DRM_DEBUG_DRIVER("port num:%d\n", i); DRM_DEBUG_DRIVER("port num:%d\n", port);
len = min_t(uint8_t, eld[2], 21); /* 84 bytes of hw ELD buffer */ len = min_t(int, eld[2], 21); /* 84 bytes of hw ELD buffer */
DRM_DEBUG_DRIVER("ELD size %d\n", len); DRM_DEBUG_DRIVER("ELD size %d\n", len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
I915_WRITE(hdmiw_hdmiedid, *((uint32_t *)eld + i)); I915_WRITE(hdmiw_hdmiedid, *((uint32_t *)eld + i));
i = I915_READ(aud_cntrl_st2); tmp = I915_READ(aud_cntrl_st2);
i |= eldv; tmp |= eldv;
I915_WRITE(aud_cntrl_st2, i); I915_WRITE(aud_cntrl_st2, tmp);
} }
static void ironlake_write_eld(struct drm_connector *connector, static void ironlake_write_eld(struct drm_connector *connector,
...@@ -228,13 +226,14 @@ static void ironlake_write_eld(struct drm_connector *connector, ...@@ -228,13 +226,14 @@ static void ironlake_write_eld(struct drm_connector *connector,
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
uint8_t *eld = connector->eld; uint8_t *eld = connector->eld;
uint32_t eldv; uint32_t eldv;
uint32_t i; uint32_t tmp;
int len; int len, i;
int hdmiw_hdmiedid; int hdmiw_hdmiedid;
int aud_config; int aud_config;
int aud_cntl_st; int aud_cntl_st;
int aud_cntrl_st2; int aud_cntrl_st2;
int pipe = to_intel_crtc(crtc)->pipe; enum pipe pipe = to_intel_crtc(crtc)->pipe;
enum port port;
if (HAS_PCH_IBX(connector->dev)) { if (HAS_PCH_IBX(connector->dev)) {
hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe); hdmiw_hdmiedid = IBX_HDMIW_HDMIEDID(pipe);
...@@ -261,22 +260,22 @@ static void ironlake_write_eld(struct drm_connector *connector, ...@@ -261,22 +260,22 @@ static void ironlake_write_eld(struct drm_connector *connector,
intel_encoder = intel_attached_encoder(connector); intel_encoder = intel_attached_encoder(connector);
intel_dig_port = enc_to_dig_port(&intel_encoder->base); intel_dig_port = enc_to_dig_port(&intel_encoder->base);
i = intel_dig_port->port; port = intel_dig_port->port;
} else { } else {
i = I915_READ(aud_cntl_st); tmp = I915_READ(aud_cntl_st);
i = (i >> 29) & DIP_PORT_SEL_MASK; port = (tmp >> 29) & DIP_PORT_SEL_MASK;
/* DIP_Port_Select, 0x1 = PortB */ /* DIP_Port_Select, 0x1 = PortB */
} }
if (!i) { if (!port) {
DRM_DEBUG_DRIVER("Audio directed to unknown port\n"); DRM_DEBUG_DRIVER("Audio directed to unknown port\n");
/* operate blindly on all ports */ /* operate blindly on all ports */
eldv = IBX_ELD_VALIDB; eldv = IBX_ELD_VALIDB;
eldv |= IBX_ELD_VALIDB << 4; eldv |= IBX_ELD_VALIDB << 4;
eldv |= IBX_ELD_VALIDB << 8; eldv |= IBX_ELD_VALIDB << 8;
} else { } else {
DRM_DEBUG_DRIVER("ELD on port %c\n", port_name(i)); DRM_DEBUG_DRIVER("ELD on port %c\n", port_name(port));
eldv = IBX_ELD_VALIDB << ((i - 1) * 4); eldv = IBX_ELD_VALIDB << ((port - 1) * 4);
} }
if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT)) { if (intel_pipe_has_type(intel_crtc, INTEL_OUTPUT_DISPLAYPORT)) {
...@@ -293,25 +292,25 @@ static void ironlake_write_eld(struct drm_connector *connector, ...@@ -293,25 +292,25 @@ static void ironlake_write_eld(struct drm_connector *connector,
hdmiw_hdmiedid)) hdmiw_hdmiedid))
return; return;
i = I915_READ(aud_cntrl_st2); tmp = I915_READ(aud_cntrl_st2);
i &= ~eldv; tmp &= ~eldv;
I915_WRITE(aud_cntrl_st2, i); I915_WRITE(aud_cntrl_st2, tmp);
if (!eld[0]) if (!eld[0])
return; return;
i = I915_READ(aud_cntl_st); tmp = I915_READ(aud_cntl_st);
i &= ~IBX_ELD_ADDRESS; tmp &= ~IBX_ELD_ADDRESS;
I915_WRITE(aud_cntl_st, i); I915_WRITE(aud_cntl_st, tmp);
len = min_t(uint8_t, eld[2], 21); /* 84 bytes of hw ELD buffer */ len = min_t(int, eld[2], 21); /* 84 bytes of hw ELD buffer */
DRM_DEBUG_DRIVER("ELD size %d\n", len); DRM_DEBUG_DRIVER("ELD size %d\n", len);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
I915_WRITE(hdmiw_hdmiedid, *((uint32_t *)eld + i)); I915_WRITE(hdmiw_hdmiedid, *((uint32_t *)eld + i));
i = I915_READ(aud_cntrl_st2); tmp = I915_READ(aud_cntrl_st2);
i |= eldv; tmp |= eldv;
I915_WRITE(aud_cntrl_st2, i); I915_WRITE(aud_cntrl_st2, tmp);
} }
void intel_write_eld(struct drm_encoder *encoder, void intel_write_eld(struct drm_encoder *encoder,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7