Commit 5c190e53 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/wm: use REG_FIELD_{PREP,GET} for PLANE_WM_BLOCKS_MASK 



Use REG_FIELD_{PREP,GET} for completeness, and to avoid bitwise
operations with different sizes.

v2: Also use REG_FIELD_GET in skl_wm_level_from_reg_val() (Ville)

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220223103517.634229-1-jani.nikula@intel.com
parent 2d053957

drivers/gpu/drm/i915/intel_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -5931,7 +5931,7 @@ static void skl_write_wm_level(struct drm_i915_private *dev_priv, 
		val |= PLANE_WM_EN;

	if (level->ignore_lines)

		val |= PLANE_WM_IGNORE_LINES;

	val |= level->blocks;

	val |= REG_FIELD_PREP(PLANE_WM_BLOCKS_MASK, level->blocks);

	val |= REG_FIELD_PREP(PLANE_WM_LINES_MASK, level->lines);



	intel_de_write_fw(dev_priv, reg, val);
@@ -6579,7 +6579,7 @@ static void skl_wm_level_from_reg_val(u32 val, struct skl_wm_level *level) 
{

	level->enable = val & PLANE_WM_EN;

	level->ignore_lines = val & PLANE_WM_IGNORE_LINES;

	level->blocks = val & PLANE_WM_BLOCKS_MASK;

	level->blocks = REG_FIELD_GET(PLANE_WM_BLOCKS_MASK, val);

	level->lines = REG_FIELD_GET(PLANE_WM_LINES_MASK, val);

}