ZC v1111 : Filtered invalid modes during QEMU resize

Author: sraman4

DVServerUMD/DVServer/DVServeredid.cpp

@@ -105,11 +105,16 @@ int get_edid_data(HANDLE devHandle, void* m, DWORD id)
 
 	DBGPRINT("Modes\n");
 	for (i = 0; i < edata->mode_size; i++) {
-		//TRIMMING LOGIC: Restricting EDID size to 32 and discarding modes with width more than 3840 & less than 1024
+		//TRIMMING LOGIC:
+		//Restricting EDID size to 32
+		//Discarding modes with width more than 3840 & less than 1024
+		//Discarding blacklisted modes
+		//Discarding the modes for which kmd & umd strides are not equal
 		if ((edata->mode_list[i].width <= WIDTH_UPPER_CAP) &&
 			(edata->mode_list[i].width >= WIDTH_LOWER_CAP) &&
 			(edid_mode_index < monitor->szModeList) &&
-			(is_blacklist(edata->mode_list[i].width, edata->mode_list[i].height) == 0)) {
+			(is_blacklist(edata->mode_list[i].width, edata->mode_list[i].height) == 0) &&
+			(is_samestride(edata->mode_list[i].width) == 0)) {
 			monitor->pModeList[edid_mode_index].Width = edata->mode_list[i].width;
 			monitor->pModeList[edid_mode_index].Height = edata->mode_list[i].height;
 			if ((DWORD)edata->mode_list[i].refreshrate == REFRESH_RATE_59)
@@ -198,3 +203,45 @@ int is_blacklist(unsigned int width, unsigned int height)
 	}
 	return DVSERVERUMD_SUCCESS;
 }
+
+/*******************************************************************************
+*
+* Description
+*
+* is_samestride - This function generates kmd, umd strides & compare them
+* It returns SUCCESS if both are same
+*
+* Parameters
+* width - resolution width
+*
+* Return val
+* int - 0 == SUCCESS, -1 = ERROR
+*
+******************************************************************************/
+int is_samestride(unsigned int width)
+{
+	UINT kmdstride = 0;
+	UINT bytes_pp = 0;
+	UINT umdstride = 0;
+	UINT rem = 0;
+	UINT padding = 0;
+
+	bytes_pp = (VGPU_BPP + 7) / 8;
+	kmdstride = (width * bytes_pp + 3) & ~0x3;
+
+	rem = width % BYTE_ALIGN_16;
+	if (rem != 0) {
+		padding = BYTE_ALIGN_16 - rem;
+	}
+	else {
+		padding = 0;
+	}
+	umdstride = 4 * (width + padding);
+
+	if (kmdstride == umdstride) {
+		return DVSERVERUMD_SUCCESS;
+	}
+	else {
+		return DVSERVERUMD_FAILURE;
+	}
+}

DVServerUMD/DVServer/DVServeredid.h

@@ -27,9 +27,12 @@
 #define REFRESH_RATE_59     59   //59Hz
 #define REFRESH_RATE_60     60   //60Hz
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
+#define VGPU_BPP            32
+#define BYTE_ALIGN_16       16
 
 int get_total_screens(HANDLE devHandle);
 int get_edid_data(HANDLE devHandle, void* m, DWORD id);
 int is_blacklist(unsigned int width, unsigned int height);
+int is_samestride(unsigned int width);
 
 #endif /* __DVSERVER_EDID_H__ */

Readme.txt

@@ -8,10 +8,15 @@
 -----------------------------------------------------------
 #####  Windows VM QEMU CMD Example #####
 -----------------------------------------------------------
+
+1) Direct QEMU command without "connectors" parameter (no association with external physical display)
+sudo qemu-system-x86_64 -m 4096 -enable-kvm -cpu host -smp cores=4,threads=2,sockets=1 -drive file=<WindowsOS.img>.img,format=qcow2,cache=none -device vfio-pci,host=0000:00:02.2 -device e1000,netdev=net0,mac=DE:AD:BE:EF:1C:00 -netdev tap,id=net0 -device virtio-vga,max_outputs=4,blob=true -display gtk,gl=on,full-screen=<on/off>, show-fps=on -object memory-backend-memfd,id=mem1,hugetlb=on,size=4096M -machine memory-backend=mem1
+
+2) Associate QEMU with External Physical Display: For this we need to use customized QEMU version with "connectors" parameter enabled
 sudo qemu-system-x86_64 -m 4096 -enable-kvm -cpu host -smp cores=4,threads=2,sockets=1 -drive file=<WindowsOS.img>.img,format=qcow2,cache=none -device vfio-pci,host=0000:00:02.2 -device e1000,netdev=net0,mac=DE:AD:BE:EF:1C:00 -netdev tap,id=net0 -device virtio-vga,max_outputs=4,blob=true -display gtk,gl=on,full-screen=<on/off>,connectors.0 = <display-port-name>, connectors.1=<display-port-name>, connectors.2=<display-port-name>, connectors.3=<display-port-name>, show-fps=on -object memory-backend-memfd,id=mem1,hugetlb=on,size=4096M -machine memory-backend=mem1
 
 Note:
-use the below command to get the display port name for that particular board
+use the below command to get the display port name for that particular board (for "connectors" parameter)
 “cat /sys/kernel/debug/dri/0/i915_display_info”
 
 -----------------------------------------------------------