iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/xe/mmio: fix forcewake ref leak in xe_mmio_ioctl

Browse Source 
Make sure we properly release the forcewake ref on all error paths.

v2(Lucas):
  - Make it less verbose and just fold the unimplemented options into
    the default. The exact return value doesn't seem to matter for the
    corresponding IGT.
  - Replace the user triggerable WARN() with drm_dbg().

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
Matthew Auld 2023-02-15 10:28:43 +00:00 committed by Rodrigo Vivi
parent ba00da78ce
commit 0d83be772c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpu/drm/xe/xe_mmio.c
View File

@ -425,31 +425,28 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data,
if (args->flags & DRM_XE_MMIO_WRITE) {
switch (bits_flag) {
case DRM_XE_MMIO_8BIT:
return -EINVAL; /* TODO */
case DRM_XE_MMIO_16BIT:
return -EINVAL; /* TODO */
case DRM_XE_MMIO_32BIT:
if (XE_IOCTL_ERR(xe, args->value > U32_MAX))
return -EINVAL;
if (XE_IOCTL_ERR(xe, args->value > U32_MAX)) {
ret = -EINVAL;
goto exit;
}
xe_mmio_write32(to_gt(xe), args->addr, args->value);
break;
case DRM_XE_MMIO_64BIT:
xe_mmio_write64(to_gt(xe), args->addr, args->value);
break;
default:
drm_WARN(&xe->drm, 1, "Invalid MMIO bit size");
ret = -EINVAL;
drm_dbg(&xe->drm, "Invalid MMIO bit size");
fallthrough;
case DRM_XE_MMIO_8BIT: /* TODO */
case DRM_XE_MMIO_16BIT: /* TODO */
ret = -ENOTSUPP;
goto exit;
}
}
if (args->flags & DRM_XE_MMIO_READ) {
switch (bits_flag) {
case DRM_XE_MMIO_8BIT:
return -EINVAL; /* TODO */
case DRM_XE_MMIO_16BIT:
return -EINVAL; /* TODO */
case DRM_XE_MMIO_32BIT:
args->value = xe_mmio_read32(to_gt(xe), args->addr);
break;
@ -457,8 +454,11 @@ int xe_mmio_ioctl(struct drm_device *dev, void *data,
args->value = xe_mmio_read64(to_gt(xe), args->addr);
break;
default:
drm_WARN(&xe->drm, 1, "Invalid MMIO bit size");
ret = -EINVAL;
drm_dbg(&xe->drm, "Invalid MMIO bit size");
fallthrough;
case DRM_XE_MMIO_8BIT: /* TODO */
case DRM_XE_MMIO_16BIT: /* TODO */
ret = -ENOTSUPP;
}
}