Skip to content

Jh7110 vision five2 6.12.y devel #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaxKrummenacher wants to merge 2 commits into
base: JH7110_VisionFive2_6.12.y_devel
Choose a base branch
from
Open

Jh7110 vision five2 6.12.y devel #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc3db4
drm/img-rogue: fix build with gcc 16
MaxKrummenacher May 30, 2026
e07479e
gcc-plugins: Always define CONST_CAST_GIMPLE and CONST_CAST_TREE
kees Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions drivers/gpu/drm/img/img-rogue/services/server/common/mmu_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3035,7 +3035,9 @@ MMU_MapPages(MMU_CONTEXT *psMMUContext,
IMG_UINT32 uiPTEIndex = 0;
IMG_UINT32 uiPageSize = (1 << uiLog2HeapPageSize);
IMG_UINT32 uiLoop = 0;
#if defined(PDUMP)
IMG_UINT32 ui32MappedCount = 0;
#endif /*PDUMP*/
IMG_DEVMEM_OFFSET_T uiPgOffset = 0;
IMG_UINT32 uiFlushEnd = 0, uiFlushStart = 0;

Expand Down Expand Up @@ -3333,7 +3335,9 @@ MMU_MapPages(MMU_CONTEXT *psMMUContext,
sDevVAddr.uiAddr,
uiPgOffset * uiPageSize));

#if defined(PDUMP)
ui32MappedCount++;
#endif /*PDUMP*/
}
}

Expand Down
7 changes: 6 additions & 1 deletion drivers/gpu/drm/img/img-rogue/services/server/common/sync_checkpoint.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3091,7 +3091,10 @@ static IMG_UINT32 _CleanCheckpointPool(_SYNC_CHECKPOINT_CONTEXT *psContext)
DECLARE_DLLIST(sCleanupList);
DLLIST_NODE *psThis, *psNext;
OS_SPINLOCK_FLAGS uiFlags;
IMG_UINT32 ui32ItemsFreed = 0, ui32NullScpCount = 0, __maybe_unused ui32PoolCount;
IMG_UINT32 ui32ItemsFreed = 0, __maybe_unused ui32PoolCount;
#if (ENABLE_SYNC_CHECKPOINT_POOL_DEBUG == 1)
IMG_UINT32 ui32NullScpCount = 0;
#endif

/* Acquire sync checkpoint pool lock */
OSSpinLockAcquire(psCtxCtl->hSyncCheckpointPoolLock, uiFlags);
Expand All @@ -3116,10 +3119,12 @@ static IMG_UINT32 _CleanCheckpointPool(_SYNC_CHECKPOINT_CONTEXT *psContext)
* from the list so it's safe to use sListNode here */
dllist_add_to_head(&sCleanupList, &psCheckpoint->sListNode);
}
#if (ENABLE_SYNC_CHECKPOINT_POOL_DEBUG == 1)
else
{
ui32NullScpCount++;
}
#endif
}

/* Release sync checkpoint pool lock */
Expand Down
6 changes: 6 additions & 0 deletions drivers/gpu/drm/img/img-rogue/services/server/devices/rgxhwperf_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3500,7 +3500,9 @@ PVRSRV_ERROR RGXHWPerfAcquireEvents(
PVRSRV_ERROR eError;
RGX_KM_HWPERF_DEVDATA* psDevData = (RGX_KM_HWPERF_DEVDATA*)hDevData;
IMG_PBYTE pDataDest;
#if defined(DEBUG) || defined(DOXYGEN)
IMG_UINT32 ui32TlPackets = 0;
#endif
IMG_PBYTE pBufferEnd;
PVRSRVTL_PPACKETHDR psHDRptr;
PVRSRVTL_PACKETTYPE ui16TlType;
Expand Down Expand Up @@ -3578,10 +3580,14 @@ PVRSRV_ERROR RGXHWPerfAcquireEvents(
psHDRptr = GET_NEXT_PACKET_ADDR(psHDRptr);
/* Updated to keep track of the next packet to be read. */
psDevData->pTlBufRead[eStreamId] = (IMG_PBYTE) ((void *)psHDRptr);
#if defined(DEBUG) || defined(DOXYGEN)
ui32TlPackets++;
#endif
}

#if defined(DEBUG) || defined(DOXYGEN)
PVR_DPF((PVR_DBG_VERBOSE, "RGXHWPerfAcquireEvents: TL Packets processed %03d", ui32TlPackets));
#endif

psDevData->bRelease[eStreamId] = IMG_FALSE;
if (psHDRptr >= (PVRSRVTL_PPACKETHDR)((void *)pBufferEnd))
Expand Down
4 changes: 3 additions & 1 deletion scripts/gcc-plugins/gcc-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,9 @@ typedef const gimple *const_gimple_ptr;
#define gimple gimple_ptr
#define const_gimple const_gimple_ptr
#undef CONST_CAST_GIMPLE
#define CONST_CAST_GIMPLE(X) CONST_CAST(gimple, (X))
#define CONST_CAST_GIMPLE(X) const_cast<gimple>((X))
#undef CONST_CAST_TREE
#define CONST_CAST_TREE(X) const_cast<tree>((X))
#endif

/* gimple related */
Expand Down