From 2176ea293710966ac3b590b3b072c3d3be9daa14 Mon Sep 17 00:00:00 2001 From: Carter Li Date: Wed, 18 Dec 2024 09:28:42 +0800 Subject: [PATCH] Revert "Display (Linux): prefer detecting physical size from EDID" Try fixing #1444 This reverts commit 5f3ce500229a58468bb32e6541952fd1af309c45. --- src/detection/displayserver/linux/xcb.c | 1 - src/detection/displayserver/linux/xlib.c | 1 - 2 files changed, 2 deletions(-) diff --git a/src/detection/displayserver/linux/xcb.c b/src/detection/displayserver/linux/xcb.c index b3eab2dec..13f8537ae 100644 --- a/src/detection/displayserver/linux/xcb.c +++ b/src/detection/displayserver/linux/xcb.c @@ -188,7 +188,6 @@ static bool xcbRandrHandleCrtc(XcbRandrData* data, xcb_randr_crtc_t crtc, FFstrb { item->hdrStatus = ffEdidGetHdrCompatible(edidData, (uint32_t) edidLength) ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED; ffEdidGetSerialAndManufactureDate(edidData, &item->serial, &item->manufactureYear, &item->manufactureWeek); - ffEdidGetPhysicalSize(edidData, &item->physicalWidth, &item->physicalHeight); } return !!item; diff --git a/src/detection/displayserver/linux/xlib.c b/src/detection/displayserver/linux/xlib.c index d2a1d1f24..0c4d283ed 100644 --- a/src/detection/displayserver/linux/xlib.c +++ b/src/detection/displayserver/linux/xlib.c @@ -151,7 +151,6 @@ static bool xrandrHandleCrtc(XrandrData* data, XRROutputInfo* output, FFstrbuf* { item->hdrStatus = ffEdidGetHdrCompatible(edidData, edidLength) ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED; ffEdidGetSerialAndManufactureDate(edidData, &item->serial, &item->manufactureYear, &item->manufactureWeek); - ffEdidGetPhysicalSize(edidData, &item->physicalWidth, &item->physicalHeight); } data->ffXRRFreeCrtcInfo(crtcInfo);