Merge remote-tracking branch 'origin/drm' into drm

Lord-Grey · Lord-Grey · commit 9a799b484cb5 · 2025-10-25T17:03:29.000+02:00
diff --git a/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp b/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp
@@ -76,10 +76,9 @@ int FramebufferFrameGrabber::grabFrame(Image<ColorRgb> & image)
 	}
 
 	/* map the device to memory */
-	auto * fbp = static_cast<uint8_t*>(mmap(nullptr, _fixInfo.smem_len, PROT_READ, MAP_PRIVATE | MAP_NORESERVE, _deviceFd, 0));
+	auto * fbp = static_cast<uint8_t*>(mmap(nullptr, _fixInfo.smem_len, PROT_READ, MAP_SHARED, _deviceFd, 0));
 	if (fbp == MAP_FAILED)
 	{
-
 		QString errorReason = QString ("Error mapping %1, [%2] %3").arg(getDeviceName()).arg(errno).arg(std::strerror(errno));
 		this->setInError ( errorReason );
 		closeDevice();

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,9 @@ int FramebufferFrameGrabber::grabFrame(Image<ColorRgb> & image)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`/* map the device to memory */`
`79`		`- auto * fbp = static_cast<uint8_t*>(mmap(nullptr, _fixInfo.smem_len, PROT_READ, MAP_PRIVATE \| MAP_NORESERVE, _deviceFd, 0));`
	`79`	`+ auto * fbp = static_cast<uint8_t*>(mmap(nullptr, _fixInfo.smem_len, PROT_READ, MAP_SHARED, _deviceFd, 0));`
`80`	`80`	`if (fbp == MAP_FAILED)`
`81`	`81`	`{`
`82`		`-`
`83`	`82`	`QString errorReason = QString ("Error mapping %1, [%2] %3").arg(getDeviceName()).arg(errno).arg(std::strerror(errno));`
`84`	`83`	`this->setInError ( errorReason );`
`85`	`84`	`closeDevice();`