diff options
| author | Jani Nikula | 2014-10-27 15:26:52 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-11-07 18:42:01 +0100 |
| commit | c46f111f5171b63572fae3f79bcfe578bc96c603 (patch) | |
| tree | d33988f44984ff85289545cd3f3c7eda8aa35e20 /drivers/gpu/drm/i915/intel_audio.c | |
| parent | drm/i915: Report the actual swizzling back to userspace (diff) | |
| download | kernel-qcow2-linux-c46f111f5171b63572fae3f79bcfe578bc96c603.tar.gz kernel-qcow2-linux-c46f111f5171b63572fae3f79bcfe578bc96c603.tar.xz kernel-qcow2-linux-c46f111f5171b63572fae3f79bcfe578bc96c603.zip | |
drm/i915: clean up and clarify audio related register defines
Make audio related register defines conform to existing style: Add _MASK
where relevant, indent the defines for register contents, don't indent
the defines for register addresses, prefix pipe specific register
address defines with underscores, drop self explanatory comments.
No functional changes.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_audio.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_audio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c index 7580b3823e30..821514c95229 100644 --- a/drivers/gpu/drm/i915/intel_audio.c +++ b/drivers/gpu/drm/i915/intel_audio.c @@ -111,12 +111,12 @@ static void g4x_audio_codec_enable(struct drm_connector *connector, if (intel_eld_uptodate(connector, G4X_AUD_CNTL_ST, eldv, - G4X_AUD_CNTL_ST, G4X_ELD_ADDR, + G4X_AUD_CNTL_ST, G4X_ELD_ADDR_MASK, G4X_HDMIW_HDMIEDID)) return; tmp = I915_READ(G4X_AUD_CNTL_ST); - tmp &= ~(eldv | G4X_ELD_ADDR); + tmp &= ~(eldv | G4X_ELD_ADDR_MASK); len = (tmp >> 9) & 0x1f; /* ELD buffer size */ I915_WRITE(G4X_AUD_CNTL_ST, tmp); @@ -193,7 +193,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, if (intel_eld_uptodate(connector, aud_cntrl_st2, eldv, - aud_cntl_st, IBX_ELD_ADDRESS, + aud_cntl_st, IBX_ELD_ADDRESS_MASK, hdmiw_hdmiedid)) return; @@ -202,7 +202,7 @@ static void hsw_audio_codec_enable(struct drm_connector *connector, I915_WRITE(aud_cntrl_st2, tmp); tmp = I915_READ(aud_cntl_st); - tmp &= ~IBX_ELD_ADDRESS; + tmp &= ~IBX_ELD_ADDRESS_MASK; I915_WRITE(aud_cntl_st, tmp); port = (tmp >> 29) & DIP_PORT_SEL_MASK; /* DIP_Port_Select, 0x1 = PortB */ DRM_DEBUG_DRIVER("port num:%d\n", port); @@ -287,7 +287,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, if (intel_eld_uptodate(connector, aud_cntrl_st2, eldv, - aud_cntl_st, IBX_ELD_ADDRESS, + aud_cntl_st, IBX_ELD_ADDRESS_MASK, hdmiw_hdmiedid)) return; @@ -296,7 +296,7 @@ static void ilk_audio_codec_enable(struct drm_connector *connector, I915_WRITE(aud_cntrl_st2, tmp); tmp = I915_READ(aud_cntl_st); - tmp &= ~IBX_ELD_ADDRESS; + tmp &= ~IBX_ELD_ADDRESS_MASK; I915_WRITE(aud_cntl_st, tmp); len = min_t(int, eld[2], 21); /* 84 bytes of hw ELD buffer */ |