From 2aa10054432dba104348f0ec1fd637ba2cdfbd54 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Thu, 23 Jan 2020 15:59:59 +0200 Subject: drm/i915/dmc: use intel uncore functions for forcewake register access MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move away from I915_READ_FW() and I915_WRITE_FW() and switch to using intel_uncore_read_fw() and intel_uncore_write_fw(), respectively. No functional changes. Reviewed-by: Ville Syrjälä Reviewed-by: Chris Wilson Signed-off-by: Jani Nikula Link: https://patchwork.freedesktop.org/patch/msgid/20200123140004.14136-1-jani.nikula@intel.com --- drivers/gpu/drm/i915/intel_csr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_csr.c b/drivers/gpu/drm/i915/intel_csr.c index ae25960f74e0..6a408e11a3de 100644 --- a/drivers/gpu/drm/i915/intel_csr.c +++ b/drivers/gpu/drm/i915/intel_csr.c @@ -315,7 +315,8 @@ void intel_csr_load_program(struct drm_i915_private *dev_priv) preempt_disable(); for (i = 0; i < fw_size; i++) - I915_WRITE_FW(CSR_PROGRAM(i), payload[i]); + intel_uncore_write_fw(&dev_priv->uncore, CSR_PROGRAM(i), + payload[i]); preempt_enable(); -- cgit v1.2.3-59-g8ed1b