Commit 52d83615 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: rename VLV IOSF SB ports parameter to unit_mask

parent bd4d1856
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -57,23 +57,23 @@ static void __vlv_punit_put(struct drm_i915_private *i915)
	iosf_mbi_punit_release();
}

void vlv_iosf_sb_get(struct drm_device *drm, unsigned long ports)
void vlv_iosf_sb_get(struct drm_device *drm, unsigned long unit_mask)
{
	struct drm_i915_private *i915 = to_i915(drm);

	if (ports & BIT(VLV_IOSF_SB_PUNIT))
	if (unit_mask & BIT(VLV_IOSF_SB_PUNIT))
		__vlv_punit_get(i915);

	mutex_lock(&i915->vlv_iosf_sb.lock);
}

void vlv_iosf_sb_put(struct drm_device *drm, unsigned long ports)
void vlv_iosf_sb_put(struct drm_device *drm, unsigned long unit_mask)
{
	struct drm_i915_private *i915 = to_i915(drm);

	mutex_unlock(&i915->vlv_iosf_sb.lock);

	if (ports & BIT(VLV_IOSF_SB_PUNIT))
	if (unit_mask & BIT(VLV_IOSF_SB_PUNIT))
		__vlv_punit_put(i915);
}

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ enum vlv_iosf_sb_unit {
void vlv_iosf_sb_init(struct drm_i915_private *i915);
void vlv_iosf_sb_fini(struct drm_i915_private *i915);

void vlv_iosf_sb_get(struct drm_device *drm, unsigned long ports);
void vlv_iosf_sb_put(struct drm_device *drm, unsigned long ports);
void vlv_iosf_sb_get(struct drm_device *drm, unsigned long unit_mask);
void vlv_iosf_sb_put(struct drm_device *drm, unsigned long unit_mask);

u32 vlv_iosf_sb_read(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr);
int vlv_iosf_sb_write(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 addr, u32 val);