aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2020-01-23 15:59:59 +0200
committerJani Nikula <jani.nikula@intel.com>2020-01-27 11:04:55 +0200
commit2aa10054432dba104348f0ec1fd637ba2cdfbd54 (patch)
tree836eeeded269f8f241b95b68a5001ccccc2d152f
parentdrm/i915/hdcp: conversion to struct drm_device based logging macros. (diff)
downloadlinux-dev-2aa10054432dba104348f0ec1fd637ba2cdfbd54.tar.xz
linux-dev-2aa10054432dba104348f0ec1fd637ba2cdfbd54.zip
drm/i915/dmc: use intel uncore functions for forcewake register access
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ä <ville.syrjala@linux.intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200123140004.14136-1-jani.nikula@intel.com
-rw-r--r--drivers/gpu/drm/i915/intel_csr.c3
1 files changed, 2 insertions, 1 deletions
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();