From: Matt Coster <[email protected]> For completeness, OR in the CACHED flags when we're not ORing in the UNCACHED counterparts. One of these is probably zero, but (a) it isn't evident just by reading these lines, and (b) the compiler will make it disappear in that case.
Signed-off-by: Matt Coster <[email protected]> Signed-off-by: Alexandru Dadu <[email protected]> --- Changes in v2: - Update the author field to the correct value. - Link to v1: https://lore.kernel.org/r/[email protected] To: Alessio Belle <[email protected]> To: Luigi Santivetti <[email protected]> To: Maarten Lankhorst <[email protected]> To: Maxime Ripard <[email protected]> To: Thomas Zimmermann <[email protected]> To: David Airlie <[email protected]> To: Simona Vetter <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] --- drivers/gpu/drm/imagination/pvr_fw_meta.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imagination/pvr_fw_meta.c b/drivers/gpu/drm/imagination/pvr_fw_meta.c index 9ff03bc60a08..b5837ba56e33 100644 --- a/drivers/gpu/drm/imagination/pvr_fw_meta.c +++ b/drivers/gpu/drm/imagination/pvr_fw_meta.c @@ -509,9 +509,13 @@ pvr_meta_get_fw_addr_with_offset(struct pvr_fw_object *fw_obj, u32 offset) u32 fw_addr = fw_obj->fw_addr_offset + offset + ROGUE_FW_SEGMMU_DATA_BASE_ADDRESS; /* META cacheability is determined by address. */ - if (fw_obj->gem->flags & PVR_BO_FW_FLAGS_DEVICE_UNCACHED) + if (fw_obj->gem->flags & PVR_BO_FW_FLAGS_DEVICE_UNCACHED) { fw_addr |= ROGUE_FW_SEGMMU_DATA_META_UNCACHED | ROGUE_FW_SEGMMU_DATA_VIVT_SLC_UNCACHED; + } else { + fw_addr |= ROGUE_FW_SEGMMU_DATA_META_CACHED | + ROGUE_FW_SEGMMU_DATA_VIVT_SLC_CACHED; + } return fw_addr; } --- base-commit: e55fead22ff9ee047ab9f1903860c4b43043514e change-id: 20260804-b4-cached-flag-on-meta-fw-b0fb2589ba72 Best regards, -- Alexandru Dadu <[email protected]>
