drm/i915/lpe_audio: use intel_de_*() functions for register access (ef589022) · Commits · 戴 / test

The implicit "dev_priv" local variable use has been a long-standing pain point in the register access macros I915_READ(), I915_WRITE(), POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW(). Replace them with the corresponding new display engine register accessors intel_de_read(), intel_de_write(), intel_de_posting_read(), intel_de_read_fw(), and intel_de_write_fw(). No functional changes. Generated using the following semantic patch: @@ expression REG, OFFSET; @@ - I915_READ(REG) + intel_de_read(dev_priv, REG) @@ expression REG, OFFSET; @@ - POSTING_READ(REG) + intel_de_posting_read(dev_priv, REG) @@ expression REG, OFFSET; @@ - I915_WRITE(REG, OFFSET) + intel_de_write(dev_priv, REG, OFFSET) @@ expression REG; @@ - I915_READ_FW(REG) + intel_de_read_fw(dev_priv, REG) @@ expression REG, OFFSET; @@ - I915_WRITE_FW(REG, OFFSET) + intel_de_write_fw(dev_priv, REG, OFFSET) Acked-by:

Chris Wilson <chris@chris-wilson.co.uk> Acked-by:

Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:

Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Signed-off-by:

Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/d920b55fe225710169349db4819ca29af349e0b4.1579871655.git.jani.nikula@intel.com

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

+8 −6

Original line number	Diff line number	Diff line
		@@ -71,6 +71,7 @@
		#include <drm/intel_lpe_audio.h>

		#include "i915_drv.h"
		#include "intel_de.h"
		#include "intel_lpe_audio.h"

		#define HAS_LPE_AUDIO(dev_priv) ((dev_priv)->lpe_audio.platdev != NULL)
		@@ -230,7 +231,8 @@ static int lpe_audio_setup(struct drm_i915_private *dev_priv)
		/* enable chicken bit; at least this is required for Dell Wyse 3040
		* with DP outputs (but only sometimes by some reason!)
		*/
		I915_WRITE(VLV_AUD_CHICKEN_BIT_REG, VLV_CHICKEN_BIT_DBG_ENABLE);
		intel_de_write(dev_priv, VLV_AUD_CHICKEN_BIT_REG,
		VLV_CHICKEN_BIT_DBG_ENABLE);

		return 0;
		err_free_irq:
		@@ -334,7 +336,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,

		spin_lock_irqsave(&pdata->lpe_audio_slock, irqflags);

		audio_enable = I915_READ(VLV_AUD_PORT_EN_DBG(port));
		audio_enable = intel_de_read(dev_priv, VLV_AUD_PORT_EN_DBG(port));

		if (eld != NULL) {
		memcpy(ppdata->eld, eld, HDMI_MAX_ELD_BYTES);
		@@ -343,7 +345,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
		ppdata->dp_output = dp_output;

		/* Unmute the amp for both DP and HDMI */
		I915_WRITE(VLV_AUD_PORT_EN_DBG(port),
		intel_de_write(dev_priv, VLV_AUD_PORT_EN_DBG(port),
		audio_enable & ~VLV_AMP_MUTE);
		} else {
		memset(ppdata->eld, 0, HDMI_MAX_ELD_BYTES);
		@@ -352,7 +354,7 @@ void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
		ppdata->dp_output = false;

		/* Mute the amp for both DP and HDMI */
		I915_WRITE(VLV_AUD_PORT_EN_DBG(port),
		intel_de_write(dev_priv, VLV_AUD_PORT_EN_DBG(port),
		audio_enable \| VLV_AMP_MUTE);
		}

Admin message