ZC v912 : HPD feature enablement and DTD EDID support

Author: sraman4

DVInstaller.ps1

@@ -21,7 +21,7 @@ function check_executables()
 		(is_present("DVServer\dvserverkmd.cat") -eq $true) -and
 		(is_present("DVServer\DVServerKMD.inf") -eq $true) -and
 		(is_present("DVServer\DVServerKMD.sys") -eq $true) -and
-		(is_present("DVEnabler.exe") -eq $true) -and
+		(is_present("DVEnabler.dll") -eq $true) -and
         (is_present("GraphicsDriver\Graphics\iigd_dch.inf") -eq $true)){
             Write-Host "Setup files present"
 			return "SUCCESS"
@@ -53,8 +53,29 @@ else {
 		}
 	}
 
-	Write-Host "Running DVEnabler..."
-	& ".\DVEnabler.exe"
+	Write-Host "creating DVEnabler Task and running it as service ..."
+
+	Remove-Item -path C:\Windows\System32\DVEnabler.dll
+
+	rundll32.exe DVEnabler.dll,dvenabler_init
+	while($true){
+		$DVE = tasklist /m | findstr "DVEnabler.dll"
+		if ($DVE) {
+			Write-Host "DvEnabler started as service ."
+			break
+		}
+		else{
+			Write-Host " Dvenabler not yet started. Please wait..."
+			continue
+		}
+	}
+
+	cp DVEnabler.dll C:\Windows\System32
+	unregister-scheduledtask -TaskName "DVEnabler" -confirm:$false -ErrorAction SilentlyContinue
+		$ac = New-ScheduledTaskAction -Execute "rundll32.exe"  -Argument "C:\Windows\System32\DVEnabler.dll,dvenabler_init"
+		$tr = New-ScheduledTaskTrigger -AtLogOn
+		$pr = New-ScheduledTaskPrincipal  -Groupid  "INTERACTIVE"
+	Register-ScheduledTask -TaskName "DVEnabler" -Trigger $tr -TaskPath "\Microsoft\Windows\DVEnabler" -Action $ac -Principal $pr
 	if ($LASTEXITCODE -eq 0) {
 		Write-Host "DVEnabler Success. DVServerUMD has taken over MSBDA!"
 	} else {

DVServerKMD/DVServerKMD_Version.txt

@@ -8,4 +8,4 @@
 ;   This file will have the DVServerKMD version 
 ;--------------------------------------------------------------------------*/
 
-DVServerKMD_Version = 3.4.0
+DVServerKMD_Version = 4.0.0

DVServerKMD/Public.h

@@ -29,9 +29,9 @@ DEFINE_GUID (GUID_DEVINTERFACE_DVServerKMD,
 #define IOCTL_DVSERVER_CURSOR_DATA			CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_DVSERVER_GET_EDID_DATA		CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_DVSERVER_SET_MODE				CTL_CODE(FILE_DEVICE_UNKNOWN, 0x810, METHOD_BUFFERED, FILE_ANY_ACCESS)
-#define IOCTL_DVSERVER_GENERAL				CTL_CODE(FILE_DEVICE_UNKNOWN, 0x811, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_DVSERVER_TEST_IMAGE			CTL_CODE(FILE_DEVICE_UNKNOWN, 0x812, METHOD_BUFFERED, FILE_ANY_ACCESS)
 #define IOCTL_DVSERVER_GET_TOTAL_SCREENS	CTL_CODE(FILE_DEVICE_UNKNOWN, 0x813, METHOD_BUFFERED, FILE_ANY_ACCESS)
+#define IOCTL_DVSERVER_HP_EVENT				CTL_CODE(FILE_DEVICE_UNKNOWN, 0x814, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
 typedef struct FrameMetaData
 {
@@ -80,6 +80,12 @@ struct screen_info
 	unsigned int total_screens;
 };
 
+struct hp_info
+{
+	HANDLE event;
+	bool screen_present[MAX_SCAN_OUT];
+};
+
 struct KMDF_IOCTL_Response
 {
 	UINT16 retval;

DVServerKMD/Queue.cpp

@@ -212,10 +212,6 @@ Return Value:
 		WdfRequestSetInformation(Request, sizeof(struct KMDF_IOCTL_Response));
 		break;
 
-	case IOCTL_DVSERVER_GENERAL:
-		// << TODO>>
-		break;
-
 	case IOCTL_DVSERVER_TEST_IMAGE:
 		status = IoctlRequestPresentFb(pDeviceContext, InputBufferLength, OutputBufferLength, Request, &bytesReturned);
 		if (status != STATUS_SUCCESS)
@@ -236,6 +232,11 @@ Return Value:
 		if (status != STATUS_SUCCESS)
 			return;
 		break;
+	case IOCTL_DVSERVER_HP_EVENT:
+		status = IoctlRequestHPEventInfo(pDeviceContext, InputBufferLength, OutputBufferLength, Request, &bytesReturned);
+		if (status != STATUS_SUCCESS)
+			return;
+		break;
 	}
 
 	WdfRequestComplete(Request, STATUS_SUCCESS);
@@ -516,7 +517,6 @@ static NTSTATUS IoctlRequestTotalScreens(
 	const WDFREQUEST      Request,
 	size_t* BytesReturned)
 {
-	UNREFERENCED_PARAMETER(DeviceContext);
 	UNREFERENCED_PARAMETER(InputBufferLength);
 	UNREFERENCED_PARAMETER(OutputBufferLength);
 	UNREFERENCED_PARAMETER(BytesReturned);
@@ -529,19 +529,61 @@ static NTSTATUS IoctlRequestTotalScreens(
 		(VioGpuAdapterLite*)(DeviceContext ? DeviceContext->pvDeviceExtension : 0);
 
 	if (!pAdapter) {
-		ERR("Coudlnt' find adapter\n");
+		ERR("Couldn't find adapter\n");
 		return status;
 	}
 
 	status = WdfRequestRetrieveOutputBuffer(Request, 0, (PVOID*)&mdata, &bufSize);
 	if (!NT_SUCCESS(status)) {
 		WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
 		return status;
-
 	}
 
 	mdata->total_screens = pAdapter->GetNumScreens();
 	WdfRequestSetInformation(Request, sizeof(struct screen_info));
 
+	return STATUS_SUCCESS;
+}
+
+static NTSTATUS IoctlRequestHPEventInfo(
+	const PDEVICE_CONTEXT DeviceContext,
+	const size_t          InputBufferLength,
+	const size_t          OutputBufferLength,
+	const WDFREQUEST      Request,
+	size_t* BytesReturned)
+{
+	UNREFERENCED_PARAMETER(DeviceContext);
+	UNREFERENCED_PARAMETER(InputBufferLength);
+	UNREFERENCED_PARAMETER(OutputBufferLength);
+	UNREFERENCED_PARAMETER(Request);
+	UNREFERENCED_PARAMETER(BytesReturned);
+
+	NTSTATUS status = STATUS_UNSUCCESSFUL;
+	struct hp_info* info = NULL;
+	size_t bufSize;
+
+	status = WdfRequestRetrieveInputBuffer(Request, 0, (PVOID*)&info, &bufSize);
+	if (!NT_SUCCESS(status)) {
+		ERR("Couldn't retrieve Input buffer\n");
+		WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
+		return status;
+	}
+
+	VioGpuAdapterLite* pAdapter =
+		(VioGpuAdapterLite*)(DeviceContext ? DeviceContext->pvDeviceExtension : 0);
+
+	if (!pAdapter) {
+		ERR("Couldn't find adapter\n");
+		return status;
+	}
+	status = WdfRequestRetrieveOutputBuffer(Request, 0, (PVOID*)&info, &bufSize);
+	if (!NT_SUCCESS(status)) {
+		WdfRequestComplete(Request, STATUS_INSUFFICIENT_RESOURCES);
+		return status;
+	}
+	pAdapter->SetEvent(info->event);
+	pAdapter->FillPresentStatus(info);
+	WdfRequestSetInformation(Request, sizeof(struct hp_info));
+
 	return STATUS_SUCCESS;
 }

DVServerKMD/Queue.h

@@ -61,6 +61,13 @@ static NTSTATUS IoctlRequestTotalScreens(
 	const WDFREQUEST      Request,
 	size_t * BytesReturned);
 
+static NTSTATUS IoctlRequestHPEventInfo(
+	const PDEVICE_CONTEXT DeviceContext,
+	const size_t          InputBufferLength,
+	const size_t          OutputBufferLength,
+	const WDFREQUEST      Request,
+	size_t* BytesReturned);
+
 //
 // Events from the IoQueue object
 //

DVServerKMD/viogpulite.cpp

@@ -69,6 +69,7 @@ ScreenInfo::ScreenInfo()
     mode_list.modelist_size = 0;
     m_pFrameBuf = NULL;
     m_FlushCount = 0;
+    enabled = FALSE;
 }
 
 ScreenInfo::~ScreenInfo()
@@ -109,12 +110,16 @@ VioGpuAdapterLite::VioGpuAdapterLite(_In_ PVOID pvDeviceContext) : IVioGpuAdapte
     m_bStopWorkThread = FALSE;
     m_pWorkThread = NULL;
     m_bBlobSupported = FALSE;
+    hpd_event = NULL;
 }
 
 VioGpuAdapterLite::~VioGpuAdapterLite(void)
 {
     PAGED_CODE();
     TRACING();
+    if (hpd_event) {
+        ObDereferenceObject(hpd_event);
+    }
     VioGpuAdapterLiteClose();
     HWClose();
     m_Id = 0;
@@ -750,7 +755,8 @@ BOOLEAN VioGpuAdapterLite::GetDisplayInfo(UINT32 screen_num)
     ULONG yres = 0;
 
     if (m_CtrlQueue.AskDisplayInfo(&vbuf, &m_screen[screen_num].m_DisplayInfoEvent)) {
-        m_CtrlQueue.GetDisplayInfo(vbuf, screen_num, &xres, &yres);
+        m_screen[screen_num].enabled = m_CtrlQueue.GetDisplayInfo(vbuf, screen_num, &xres, &yres);
+        DBGPRINT("Screen %d status = %s\n", screen_num, (m_screen[screen_num].enabled) ? "Enabled" : "Disabled");
         m_CtrlQueue.ReleaseBuffer(vbuf);
         if (xres && yres) {
             DBGPRINT("(%dx%d)\n", xres, yres);
@@ -824,7 +830,7 @@ void VioGpuAdapterLite::AddEdidModes(UINT32 screen_num)
         }
     }
     else {
-        for (unsigned int i = 0; i < QEMU_MODELIST_SIZE; i++) {
+        for (unsigned int i = 0; i < m_screen[screen_num].mode_list.modelist_size; i++) {
             m_screen[screen_num].gpu_disp_mode_ext[i].XResolution = (USHORT)m_screen[screen_num].mode_list.modelist[i].width;
             m_screen[screen_num].gpu_disp_mode_ext[i].YResolution = (USHORT)m_screen[screen_num].mode_list.modelist[i].height;
             m_screen[screen_num].gpu_disp_mode_ext[i].refresh = m_screen[screen_num].mode_list.modelist[i].refresh_rate;
@@ -1055,6 +1061,10 @@ void VioGpuAdapterLite::ConfigChanged(void)
         for (UINT32 i = 0; i < m_u32NumScanouts; i++) {
             GetDisplayInfo(i);
         }
+        if (hpd_event) {
+            DBGPRINT("Sending Hot Plug event to UMD\n");
+            KeSetEvent(hpd_event, IO_NO_INCREMENT, FALSE);
+        }
         events_clear |= VIRTIO_GPU_EVENT_DISPLAY;
         virtio_set_config(&m_VioDev, FIELD_OFFSET(GPU_CONFIG, events_clear),
             &events_clear, sizeof(m_u32NumScanouts));
@@ -1362,4 +1372,24 @@ BOOLEAN VioGpuAdapterLite::GpuObjectAttach(UINT res_id, VioGpuObj* obj, ULONGLON
     return TRUE;
 }
 
+VOID VioGpuAdapterLite::SetEvent(HANDLE event)
+{
+    NTSTATUS status;
+    /* If the UMD has provided us with an event and we don't have it initialized already */
+    if (event && !hpd_event) {
+        status = ObReferenceObjectByHandle(event, SYNCHRONIZE | EVENT_MODIFY_STATE,
+            *ExEventObjectType, UserMode, (PVOID * ) &hpd_event, NULL);
+        if (status != STATUS_SUCCESS) {
+            ERR("Couldn't retrieve event from handle. Error is %d\n", status);
+        }
+    }
+}
+
+VOID VioGpuAdapterLite::FillPresentStatus(struct hp_info* info)
+{
+    for (UINT32 i = 0; i < m_u32NumScanouts; i++) {
+        info->screen_present[i] = m_screen[i].enabled;
+    }
+}
+
 PAGED_CODE_SEG_END

DVServerKMD/viogpulite.h

@@ -94,6 +94,7 @@ class ScreenInfo {
     VioGpuMemSegment m_FrameSegment;
     VioGpuObj* m_pFrameBuf;
     BOOL m_FlushCount;
+    BOOL enabled;
 
 public:
     ScreenInfo();
@@ -166,19 +167,20 @@ class VioGpuAdapterLite :
         return m_Flags.HardwareInit;
     }
     UINT32 GetNumScreens() { return m_u32NumScanouts; }
-    UINT32 GetModeListSize(UINT32 screen_num) { return m_screen[screen_num].mode_list.modelist_size;  }
+    UINT32 GetModeListSize(UINT32 screen_num) { return m_screen[screen_num].mode_list.modelist_size; }
     VOID CopyResolution(UINT32 screen_num, struct edid_info* edata);
     PVOID GetFbVAddr(UINT32 screen_num) { return m_screen[screen_num].m_FrameSegment.GetFbVAddr(); }
     VOID Close(UINT32 screen_num) { m_screen[screen_num].m_FrameSegment.Close(); }
+    PBYTE GetEdidData(UINT Idx);
+    VOID FillPresentStatus(struct hp_info* info);
+    VOID SetEvent(HANDLE event);
+
 private:
 
     void SetHardwareInit(BOOLEAN init)
     {
         m_Flags.HardwareInit = init;
     }
-
-protected:
-private:
     NTSTATUS VioGpuAdapterLiteInit();
     void VioGpuAdapterLiteClose(void);
     NTSTATUS GetModeList(DXGK_DISPLAY_INFORMATION* pDispInfo);
@@ -199,8 +201,6 @@ class VioGpuAdapterLite :
     void ConfigChanged(void);
     NTSTATUS VirtIoDeviceInit(void);
     DEVICE_STATUS_FLAG m_Flags;
-
-private:
     VirtIODevice m_VioDev;
     CPciResources m_PciResources;
     UINT64 m_u64HostFeatures;
@@ -215,12 +215,10 @@ class VioGpuAdapterLite :
     VioGpuMemSegment m_CursorSegment;
     volatile ULONG m_PendingWorks;
     KEVENT m_ConfigUpdateEvent;
-
     PETHREAD m_pWorkThread;
     BOOLEAN m_bStopWorkThread;
     CURRENT_MODE m_CurrentModeInfo;
     BOOLEAN m_bBlobSupported;
-public:
-	PBYTE GetEdidData(UINT Idx);
+    PKEVENT hpd_event;
 };