diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2022-09-12 14:45:16 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2022-09-13 19:55:12 +0300 |
| commit | c73cdd12de96ac4ae175b5095b5bdab6af96fcf4 (patch) | |
| tree | 40339ab9ced178294941423984e780fb5321cc93 | |
| parent | 70296670f672e470a5b42f72468a9fe631264070 (diff) | |
| download | linux-c73cdd12de96ac4ae175b5095b5bdab6af96fcf4.tar.gz | |
drm/i915/ipc: use intel_uncore_rmw() to enable/disable
Don't duplicate the rmw function.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/113a17cd18401b0e4c83396575b67aa6efb07346.1662983005.git.jani.nikula@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/skl_watermark.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 09249a42a53f..617a1f2d01ea 100644 --- a/drivers/gpu/drm/i915/display/skl_watermark.c +++ b/drivers/gpu/drm/i915/display/skl_watermark.c @@ -3127,19 +3127,11 @@ bool skl_watermark_ipc_enabled(struct drm_i915_private *i915) void skl_watermark_ipc_update(struct drm_i915_private *i915) { - u32 val; - if (!HAS_IPC(i915)) return; - val = intel_uncore_read(&i915->uncore, DISP_ARB_CTL2); - - if (skl_watermark_ipc_enabled(i915)) - val |= DISP_IPC_ENABLE; - else - val &= ~DISP_IPC_ENABLE; - - intel_uncore_write(&i915->uncore, DISP_ARB_CTL2, val); + intel_uncore_rmw(&i915->uncore, DISP_ARB_CTL2, DISP_IPC_ENABLE, + skl_watermark_ipc_enabled(i915) ? DISP_IPC_ENABLE : 0); } static bool skl_watermark_ipc_can_enable(struct drm_i915_private *i915) |