xf86-video-amdgpu: Branch 'master' - 2 commits

[GitLab Mirror]

 src/amdgpu_kms.c      |    2 +-
 src/amdgpu_probe.c    |    2 +-
 src/drmmode_display.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ee16309bc44264e7358a6d35b9f2da2bebdd5caf
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed May 8 14:20:32 2024 +0200

    use XNFcallocarray() instead of xnfcalloc macro
    
    xnfcalloc is just an alias for XNFcallocarray() that doesn't seem to serve
    any practical purpose, so it can go away once all drivers stopped using it.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 718f4eb..6a48655 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -245,7 +245,7 @@ static Bool AMDGPUGetRec(ScrnInfoPtr pScrn)
 	if (pScrn->driverPrivate)
 		return TRUE;
 
-	pScrn->driverPrivate = xnfcalloc(sizeof(AMDGPUInfoRec), 1);
+	pScrn->driverPrivate = XNFcallocarray(sizeof(AMDGPUInfoRec), 1);
 	return TRUE;
 }
 
diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index b6c8312..3fc64b1 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -277,7 +277,7 @@ amdgpu_probe(ScrnInfoPtr pScrn, int entity_num,
 	pPriv = xf86GetEntityPrivate(pEnt->index, gAMDGPUEntityIndex);
 
 	if (!pPriv->ptr) {
-		pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1);
+		pPriv->ptr = XNFcallocarray(sizeof(AMDGPUEntRec), 1);
 		if (!pPriv->ptr)
 			goto error;
 
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 09d2b37..f7c6a3d 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -1936,7 +1936,7 @@ drmmode_crtc_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, drmModeResPtr mode_res
 	if (!crtc)
 		return 0;
 
-	drmmode_crtc = xnfcalloc(sizeof(drmmode_crtc_private_rec), 1);
+	drmmode_crtc = XNFcallocarray(sizeof(drmmode_crtc_private_rec), 1);
 	drmmode_crtc->mode_crtc =
 	    drmModeGetCrtc(pAMDGPUEnt->fd, mode_res->crtcs[num]);
 	drmmode_crtc->drmmode = drmmode;
commit 5d160053ade3ec0b6153699d15d82b32a1833f4a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed May 8 11:40:26 2024 +0200

    use XNFalloc() instead of xnfalloc
    
    xnfalloc is just an alias for XNFalloc() that doesn't seem to serve
    any practical purpose, so it can go away once all drivers stopped using it.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>

diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c4dfbc0..09d2b37 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -2177,7 +2177,7 @@ static DisplayModePtr drmmode_output_get_modes(xf86OutputPtr output)
 
 	/* modes should already be available */
 	for (i = 0; i < koutput->count_modes; i++) {
-		Mode = xnfalloc(sizeof(DisplayModeRec));
+		Mode = XNFalloc(sizeof(DisplayModeRec));
 
 		drmmode_ConvertFromKMode(output->scrn, &koutput->modes[i],
 					 Mode);