From 092f97eb19b7a9cc89eeeb8a7bcb80f02dc3cd8a Mon Sep 17 00:00:00 2001 From: Vitalii Chulak Date: Thu, 9 Jan 2025 14:25:14 +0200 Subject: [PATCH] RHEL-69074: broken style fix for viogpu driver Signed-off-by: Vitalii Chulak --- viogpu/common/baseobj.cpp | 4 +++- viogpu/common/edid.cpp | 27 ++++++++++++++------------- viogpu/common/viogpu_pci.cpp | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/viogpu/common/baseobj.cpp b/viogpu/common/baseobj.cpp index 4981755d..c111c054 100644 --- a/viogpu/common/baseobj.cpp +++ b/viogpu/common/baseobj.cpp @@ -1,10 +1,12 @@ #include "baseobj.h" #include "viogpu.h" +// clang-format off _When_((PoolType & NonPagedPoolMustSucceed) != 0, __drv_reportError("Must succeed pool allocations are forbidden. " "Allocation failures cause a system crash")) void* __cdecl operator new(size_t Size, POOL_TYPE PoolType) +// clang-format on { Size = (Size != 0) ? Size : 1; @@ -22,7 +24,7 @@ _When_((PoolType & NonPagedPoolMustSucceed) != 0, } _When_((PoolType & NonPagedPoolMustSucceed) != 0, - __drv_reportError("Must succeed pool allocations are forbidden. " + __drv_reportError("Must succeed pool allocations are forbidden. " "Allocation failures cause a system crash")) void *__cdecl operator new[](size_t Size, POOL_TYPE PoolType) { diff --git a/viogpu/common/edid.cpp b/viogpu/common/edid.cpp index 5cedb48b..96f49ff2 100644 --- a/viogpu/common/edid.cpp +++ b/viogpu/common/edid.cpp @@ -1,5 +1,6 @@ #include "edid.h" +// clang-format off static VIC_MODE gpu_vic_mode_table[] = { {1, {640, 480}}, @@ -184,7 +185,7 @@ UCHAR g_gpu_edid[EDID_V1_BLOCK_SIZE] = { 0x00, // Number of Extentions 0x00 // CheckSum }; - +// clang-format on bool GetStandardTimingResolution(PSTANDARD_TIMING_DESCRIPTOR desc, PVIOGPU_DISP_MODE mode) { if (desc && mode && (desc->HorizontalActivePixels > 0)) @@ -192,18 +193,18 @@ bool GetStandardTimingResolution(PSTANDARD_TIMING_DESCRIPTOR desc, PVIOGPU_DISP_ mode->XResolution = (desc->HorizontalActivePixels + 31) * 8; switch (desc->RefreshRate) { - case AR_16_10: - mode->YResolution = ((mode->XResolution) / 16 * 10); - break; - case AR_4_3: - mode->YResolution = ((mode->XResolution) / 4 * 3); - break; - case AR_5_4: - mode->YResolution = ((mode->XResolution) / 5 * 4); - break; - case AR_16_9: - mode->YResolution = ((mode->XResolution) / 16 * 9); - break; + case AR_16_10: + mode->YResolution = ((mode->XResolution) / 16 * 10); + break; + case AR_4_3: + mode->YResolution = ((mode->XResolution) / 4 * 3); + break; + case AR_5_4: + mode->YResolution = ((mode->XResolution) / 5 * 4); + break; + case AR_16_9: + mode->YResolution = ((mode->XResolution) / 16 * 9); + break; } return true; } diff --git a/viogpu/common/viogpu_pci.cpp b/viogpu/common/viogpu_pci.cpp index eb44bfac..3cae020d 100644 --- a/viogpu/common/viogpu_pci.cpp +++ b/viogpu/common/viogpu_pci.cpp @@ -266,7 +266,7 @@ void vdev_sleep(void *context, unsigned int msecs) } } - +// clang-format off VirtIOSystemOps VioGpuSystemOps = { ReadVirtIODeviceByte, ReadVirtIODeviceWord, @@ -287,7 +287,7 @@ VirtIOSystemOps VioGpuSystemOps = { vdev_get_msix_vector, vdev_sleep, }; - +// clang-format on PVOID CPciBar::GetVA(PDXGKRNL_INTERFACE pDxgkInterface) {