From: Jani Nikula Date: Mon, 12 Sep 2022 11:45:16 +0000 (+0300) Subject: drm/i915/ipc: use intel_uncore_rmw() to enable/disable X-Git-Tag: v6.1-rc1~159^2~11^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c73cdd12de96ac4ae175b5095b5bdab6af96fcf4;p=thirdparty%2Fkernel%2Flinux.git drm/i915/ipc: use intel_uncore_rmw() to enable/disable Don't duplicate the rmw function. Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/113a17cd18401b0e4c83396575b67aa6efb07346.1662983005.git.jani.nikula@intel.com --- diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c index 09249a42a53f4..617a1f2d01ea9 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)