Skip to content

Commit a382291

Browse files
committed
drm/xe: Removing extra mem_access protection from runtime pm
This is not needed any longer, now that we have all the protection in place with the runtime pm itself. Reviewed-by: Matthew Auld <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Rodrigo Vivi <[email protected]>
1 parent fdea94a commit a382291

File tree

3 files changed

+0
-12
lines changed

3 files changed

+0
-12
lines changed

drivers/gpu/drm/xe/xe_device.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -717,14 +717,6 @@ u32 xe_device_ccs_bytes(struct xe_device *xe, u64 size)
717717
DIV_ROUND_UP_ULL(size, NUM_BYTES_PER_CCS_BYTE(xe)) : 0;
718718
}
719719

720-
bool xe_device_mem_access_ongoing(struct xe_device *xe)
721-
{
722-
if (xe_pm_read_callback_task(xe) != NULL)
723-
return true;
724-
725-
return atomic_read(&xe->mem_access.ref);
726-
}
727-
728720
/**
729721
* xe_device_assert_mem_access - Inspect the current runtime_pm state.
730722
* @xe: xe device instance

drivers/gpu/drm/xe/xe_device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ bool xe_device_mem_access_get_if_ongoing(struct xe_device *xe);
138138
void xe_device_mem_access_put(struct xe_device *xe);
139139

140140
void xe_device_assert_mem_access(struct xe_device *xe);
141-
bool xe_device_mem_access_ongoing(struct xe_device *xe);
142141

143142
static inline bool xe_device_in_fault_mode(struct xe_device *xe)
144143
{

drivers/gpu/drm/xe/xe_pm.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,6 @@ int xe_pm_runtime_suspend(struct xe_device *xe)
306306
u8 id;
307307
int err = 0;
308308

309-
if (xe->d3cold.allowed && xe_device_mem_access_ongoing(xe))
310-
return -EBUSY;
311-
312309
/* Disable access_ongoing asserts and prevent recursive pm calls */
313310
xe_pm_write_callback_task(xe, current);
314311

0 commit comments

Comments
 (0)