sugar/linux
1
0
Fork 0
Code Activity

drm/i915: ensure correct VLV IOSF SB units have been get/put

Browse Source 
Add some extra paranoia to check correct use of the VLV IOSF SB
get/put/read/write.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/be6f029adf7148198821e5fe01dcf5d5406aa1fe.1747061743.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula
2025-05-12 17:56:59 +03:00
parent 52d8361531
commit 11b5b1bd97
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/i915_drv.h
View File

@@ -230,6 +230,7 @@ struct drm_i915_private {
/* VLV/CHV IOSF sideband */
struct {
struct mutex lock; /* protect sideband access */
unsigned long locked_unit_mask;
struct pm_qos_request qos;
} vlv_iosf_sb;

10
drivers/gpu/drm/i915/vlv_iosf_sb.c
View File

@@ -65,12 +65,18 @@ void vlv_iosf_sb_get(struct drm_device *drm, unsigned long unit_mask)
__vlv_punit_get(i915);
mutex_lock(&i915->vlv_iosf_sb.lock);
i915->vlv_iosf_sb.locked_unit_mask |= unit_mask;
}
void vlv_iosf_sb_put(struct drm_device *drm, unsigned long unit_mask)
{
struct drm_i915_private *i915 = to_i915(drm);
i915->vlv_iosf_sb.locked_unit_mask &= ~unit_mask;
drm_WARN_ON(drm, i915->vlv_iosf_sb.locked_unit_mask);
mutex_unlock(&i915->vlv_iosf_sb.lock);
if (unit_mask & BIT(VLV_IOSF_SB_PUNIT))
@@ -182,6 +188,8 @@ u32 vlv_iosf_sb_read(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 add
if (drm_WARN_ONCE(&i915->drm, !port, "invalid unit %d\n", unit))
return 0;
drm_WARN_ON(&i915->drm, !(i915->vlv_iosf_sb.locked_unit_mask & BIT(unit)));
vlv_sideband_rw(i915, devfn, port, opcode, addr, &val);
return val;
@@ -199,6 +207,8 @@ int vlv_iosf_sb_write(struct drm_device *drm, enum vlv_iosf_sb_unit unit, u32 ad
if (drm_WARN_ONCE(&i915->drm, !port, "invalid unit %d\n", unit))
return -EINVAL;
drm_WARN_ON(&i915->drm, !(i915->vlv_iosf_sb.locked_unit_mask & BIT(unit)));
return vlv_sideband_rw(i915, devfn, port, opcode, addr, &val);
}