Index: /trunk/include/VBox/Graphics/VBoxVideoGuest.h
===================================================================
--- /trunk/include/VBox/Graphics/VBoxVideoGuest.h	(revision 104833)
+++ /trunk/include/VBox/Graphics/VBoxVideoGuest.h	(revision 104834)
@@ -98,6 +98,6 @@
                                                  uint8_t *pPixels,
                                                  uint32_t cbLength);
-DECLHIDDEN(int)      VBoxHGSMICursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition, uint32_t x, uint32_t y,
-                                             uint32_t *pxHost, uint32_t *pyHost);
+DECLHIDDEN(int)      VBoxHGSMIReportCursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition, uint32_t x, uint32_t y,
+                                                   uint32_t *pxHost, uint32_t *pyHost);
 
 /** @}  */
Index: /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp	(revision 104833)
+++ /trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp	(revision 104834)
@@ -256,6 +256,6 @@
  * @returns  VERR_NO_MEMORY      HGSMI heap allocation failed.
  */
-DECLHIDDEN(int) VBoxHGSMICursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition,
-                                        uint32_t x, uint32_t y, uint32_t *pxHost, uint32_t *pyHost)
+DECLHIDDEN(int) VBoxHGSMIReportCursorPosition(PHGSMIGUESTCOMMANDCONTEXT pCtx, bool fReportPosition,
+                                              uint32_t x, uint32_t y, uint32_t *pxHost, uint32_t *pyHost)
 {
     VBVACURSORPOSITION *p;
Index: /trunk/src/VBox/Additions/linux/drm/vbox_mode.c
===================================================================
--- /trunk/src/VBox/Additions/linux/drm/vbox_mode.c	(revision 104833)
+++ /trunk/src/VBox/Additions/linux/drm/vbox_mode.c	(revision 104834)
@@ -58,6 +58,6 @@
 
 static int vbox_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
-			    u32 handle, u32 width, u32 height,
-			    s32 hot_x, s32 hot_y);
+                u32 handle, u32 width, u32 height,
+                s32 hot_x, s32 hot_y);
 static int vbox_cursor_move(struct drm_crtc *crtc, int x, int y);
 
@@ -67,87 +67,87 @@
  */
 static void vbox_do_modeset(struct drm_crtc *crtc,
-			    const struct drm_display_mode *mode)
-{
-	struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-	struct vbox_private *vbox;
-	int width, height, bpp, pitch;
-	u16 flags;
-	s32 x_offset, y_offset;
-
-	vbox = crtc->dev->dev_private;
-	width = mode->hdisplay ? mode->hdisplay : 640;
-	height = mode->vdisplay ? mode->vdisplay : 480;
+                const struct drm_display_mode *mode)
+{
+    struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
+    struct vbox_private *vbox;
+    int width, height, bpp, pitch;
+    u16 flags;
+    s32 x_offset, y_offset;
+
+    vbox = crtc->dev->dev_private;
+    width = mode->hdisplay ? mode->hdisplay : 640;
+    height = mode->vdisplay ? mode->vdisplay : 480;
 #if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
-	bpp = crtc->enabled ? CRTC_FB(crtc)->format->cpp[0] * 8 : 32;
-	pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
+    bpp = crtc->enabled ? CRTC_FB(crtc)->format->cpp[0] * 8 : 32;
+    pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
 #elif RTLNX_VER_MIN(3,3,0)
-	bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
-	pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
-#else
-	bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
-	pitch = crtc->enabled ? CRTC_FB(crtc)->pitch : width * bpp / 8;
-#endif
-	x_offset = vbox->single_framebuffer ? crtc->x : vbox_crtc->x_hint;
-	y_offset = vbox->single_framebuffer ? crtc->y : vbox_crtc->y_hint;
-
-	/*
-	 * This is the old way of setting graphics modes.  It assumed one screen
-	 * and a frame-buffer at the start of video RAM.  On older versions of
-	 * VirtualBox, certain parts of the code still assume that the first
-	 * screen is programmed this way, so try to fake it.
-	 */
-	if (vbox_crtc->crtc_id == 0 && crtc->enabled &&
-	    vbox_crtc->fb_offset / pitch < 0xffff - crtc->y &&
-	    vbox_crtc->fb_offset % (bpp / 8) == 0)
-		VBoxVideoSetModeRegisters(
-			width, height, pitch * 8 / bpp,
+    bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
+    pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
+#else
+    bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
+    pitch = crtc->enabled ? CRTC_FB(crtc)->pitch : width * bpp / 8;
+#endif
+    x_offset = vbox->single_framebuffer ? crtc->x : vbox_crtc->x_hint;
+    y_offset = vbox->single_framebuffer ? crtc->y : vbox_crtc->y_hint;
+
+    /*
+     * This is the old way of setting graphics modes.  It assumed one screen
+     * and a frame-buffer at the start of video RAM.  On older versions of
+     * VirtualBox, certain parts of the code still assume that the first
+     * screen is programmed this way, so try to fake it.
+     */
+    if (vbox_crtc->crtc_id == 0 && crtc->enabled &&
+        vbox_crtc->fb_offset / pitch < 0xffff - crtc->y &&
+        vbox_crtc->fb_offset % (bpp / 8) == 0)
+        VBoxVideoSetModeRegisters(
+            width, height, pitch * 8 / bpp,
 #if RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
-			CRTC_FB(crtc)->format->cpp[0] * 8,
-#else
-			CRTC_FB(crtc)->bits_per_pixel,
-#endif
-			0,
-			vbox_crtc->fb_offset % pitch / bpp * 8 + crtc->x,
-			vbox_crtc->fb_offset / pitch + crtc->y);
-
-	flags = VBVA_SCREEN_F_ACTIVE;
-	flags |= (crtc->enabled && !vbox_crtc->blanked) ?
-		 0 : VBVA_SCREEN_F_BLANK;
-	flags |= vbox_crtc->disconnected ? VBVA_SCREEN_F_DISABLED : 0;
-	VBoxHGSMIProcessDisplayInfo(vbox->guest_pool, vbox_crtc->crtc_id,
-				   x_offset, y_offset, vbox_crtc->fb_offset +
-				   crtc->x * bpp / 8 + crtc->y * pitch,
-				   pitch, width, height,
-				   vbox_crtc->blanked ? 0 : bpp, flags);
+            CRTC_FB(crtc)->format->cpp[0] * 8,
+#else
+            CRTC_FB(crtc)->bits_per_pixel,
+#endif
+            0,
+            vbox_crtc->fb_offset % pitch / bpp * 8 + crtc->x,
+            vbox_crtc->fb_offset / pitch + crtc->y);
+
+    flags = VBVA_SCREEN_F_ACTIVE;
+    flags |= (crtc->enabled && !vbox_crtc->blanked) ?
+         0 : VBVA_SCREEN_F_BLANK;
+    flags |= vbox_crtc->disconnected ? VBVA_SCREEN_F_DISABLED : 0;
+    VBoxHGSMIProcessDisplayInfo(vbox->guest_pool, vbox_crtc->crtc_id,
+                   x_offset, y_offset, vbox_crtc->fb_offset +
+                   crtc->x * bpp / 8 + crtc->y * pitch,
+                   pitch, width, height,
+                   vbox_crtc->blanked ? 0 : bpp, flags);
 }
 
 static void vbox_crtc_dpms(struct drm_crtc *crtc, int mode)
 {
-	struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-	struct vbox_private *vbox = crtc->dev->dev_private;
-
-	switch (mode) {
-	case DRM_MODE_DPMS_ON:
-		vbox_crtc->blanked = false;
-		/* Restart the refresh timer if necessary. */
-		schedule_delayed_work(&vbox->refresh_work, VBOX_REFRESH_PERIOD);
-		break;
-	case DRM_MODE_DPMS_STANDBY:
-	case DRM_MODE_DPMS_SUSPEND:
-	case DRM_MODE_DPMS_OFF:
-		vbox_crtc->blanked = true;
-		break;
-	}
-
-	mutex_lock(&vbox->hw_mutex);
-	vbox_do_modeset(crtc, &crtc->hwmode);
-	mutex_unlock(&vbox->hw_mutex);
+    struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
+    struct vbox_private *vbox = crtc->dev->dev_private;
+
+    switch (mode) {
+    case DRM_MODE_DPMS_ON:
+        vbox_crtc->blanked = false;
+        /* Restart the refresh timer if necessary. */
+        schedule_delayed_work(&vbox->refresh_work, VBOX_REFRESH_PERIOD);
+        break;
+    case DRM_MODE_DPMS_STANDBY:
+    case DRM_MODE_DPMS_SUSPEND:
+    case DRM_MODE_DPMS_OFF:
+        vbox_crtc->blanked = true;
+        break;
+    }
+
+    mutex_lock(&vbox->hw_mutex);
+    vbox_do_modeset(crtc, &crtc->hwmode);
+    mutex_unlock(&vbox->hw_mutex);
 }
 
 static bool vbox_crtc_mode_fixup(struct drm_crtc *crtc,
-				 const struct drm_display_mode *mode,
-				 struct drm_display_mode *adjusted_mode)
-{
-	return true;
+                 const struct drm_display_mode *mode,
+                 struct drm_display_mode *adjusted_mode)
+{
+    return true;
 }
 
@@ -159,178 +159,178 @@
 static bool vbox_set_up_input_mapping(struct vbox_private *vbox)
 {
-	struct drm_crtc *crtci;
-	struct drm_connector *connectori;
-	struct drm_framebuffer *fb1 = NULL;
-	bool single_framebuffer = true;
-	bool old_single_framebuffer = vbox->single_framebuffer;
-	u16 width = 0, height = 0;
-
-	/*
-	 * Are we using an X.Org-style single large frame-buffer for all crtcs?
-	 * If so then screen layout can be deduced from the crtc offsets.
-	 * Same fall-back if this is the fbdev frame-buffer.
-	 */
-	list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list, head) {
-		if (!fb1) {
-			fb1 = CRTC_FB(crtci);
-			if (to_vbox_framebuffer(fb1) == &vbox->fbdev->afb)
-				break;
-		} else if (CRTC_FB(crtci) && fb1 != CRTC_FB(crtci)) {
-			single_framebuffer = false;
-		}
-	}
-	if (single_framebuffer) {
-		list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
-				    head) {
-			if (to_vbox_crtc(crtci)->crtc_id != 0)
-				continue;
-
-			if (!CRTC_FB(crtci))
-				break;
-			vbox->single_framebuffer = true;
-			vbox->input_mapping_width = CRTC_FB(crtci)->width;
-			vbox->input_mapping_height = CRTC_FB(crtci)->height;
-			return old_single_framebuffer !=
-			       vbox->single_framebuffer;
-		}
-	}
-	/* Otherwise calculate the total span of all screens. */
-	list_for_each_entry(connectori, &vbox->dev->mode_config.connector_list,
-			    head) {
-		struct vbox_connector *vbox_connector =
-		    to_vbox_connector(connectori);
-		struct vbox_crtc *vbox_crtc = vbox_connector->vbox_crtc;
-
-		width = max_t(u16, width, vbox_crtc->x_hint +
-					  vbox_connector->mode_hint.width);
-		height = max_t(u16, height, vbox_crtc->y_hint +
-					    vbox_connector->mode_hint.height);
-	}
-
-	vbox->single_framebuffer = false;
-	vbox->input_mapping_width = width;
-	vbox->input_mapping_height = height;
-
-	return old_single_framebuffer != vbox->single_framebuffer;
+    struct drm_crtc *crtci;
+    struct drm_connector *connectori;
+    struct drm_framebuffer *fb1 = NULL;
+    bool single_framebuffer = true;
+    bool old_single_framebuffer = vbox->single_framebuffer;
+    u16 width = 0, height = 0;
+
+    /*
+     * Are we using an X.Org-style single large frame-buffer for all crtcs?
+     * If so then screen layout can be deduced from the crtc offsets.
+     * Same fall-back if this is the fbdev frame-buffer.
+     */
+    list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list, head) {
+        if (!fb1) {
+            fb1 = CRTC_FB(crtci);
+            if (to_vbox_framebuffer(fb1) == &vbox->fbdev->afb)
+                break;
+        } else if (CRTC_FB(crtci) && fb1 != CRTC_FB(crtci)) {
+            single_framebuffer = false;
+        }
+    }
+    if (single_framebuffer) {
+        list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
+                    head) {
+            if (to_vbox_crtc(crtci)->crtc_id != 0)
+                continue;
+
+            if (!CRTC_FB(crtci))
+                break;
+            vbox->single_framebuffer = true;
+            vbox->input_mapping_width = CRTC_FB(crtci)->width;
+            vbox->input_mapping_height = CRTC_FB(crtci)->height;
+            return old_single_framebuffer !=
+                   vbox->single_framebuffer;
+        }
+    }
+    /* Otherwise calculate the total span of all screens. */
+    list_for_each_entry(connectori, &vbox->dev->mode_config.connector_list,
+                head) {
+        struct vbox_connector *vbox_connector =
+            to_vbox_connector(connectori);
+        struct vbox_crtc *vbox_crtc = vbox_connector->vbox_crtc;
+
+        width = max_t(u16, width, vbox_crtc->x_hint +
+                      vbox_connector->mode_hint.width);
+        height = max_t(u16, height, vbox_crtc->y_hint +
+                        vbox_connector->mode_hint.height);
+    }
+
+    vbox->single_framebuffer = false;
+    vbox->input_mapping_width = width;
+    vbox->input_mapping_height = height;
+
+    return old_single_framebuffer != vbox->single_framebuffer;
 }
 
 static int vbox_crtc_set_base(struct drm_crtc *crtc,
-				 struct drm_framebuffer *old_fb,
-				 struct drm_framebuffer *new_fb,
-				 int x, int y)
-{
-	struct vbox_private *vbox = crtc->dev->dev_private;
-	struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-	struct drm_gem_object *obj;
-	struct vbox_framebuffer *vbox_fb;
-	struct vbox_bo *bo;
-	int ret;
-	u64 gpu_addr;
-
-	vbox_fb = to_vbox_framebuffer(new_fb);
-	obj = vbox_fb->obj;
-	bo = gem_to_vbox_bo(obj);
-
-	ret = vbox_bo_reserve(bo, false);
-	if (ret)
-		return ret;
-
-	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr);
-	vbox_bo_unreserve(bo);
-	if (ret)
-		return ret;
-
-	/* Unpin the previous fb.  Do this after the new one has been pinned rather
-	 * than before and re-pinning it on failure in case that fails too. */
-	if (old_fb) {
-		vbox_fb = to_vbox_framebuffer(old_fb);
-		obj = vbox_fb->obj;
-		bo = gem_to_vbox_bo(obj);
-		ret = vbox_bo_reserve(bo, false);
-		/* This should never fail, as no one else should be accessing it and we
-		 * should be running under the modeset locks. */
-		if (!ret) {
-			vbox_bo_unpin(bo);
-			vbox_bo_unreserve(bo);
-		}
-		else
-		{
-			DRM_ERROR("unable to lock buffer object: error %d\n", ret);
-		}
-	}
-
-	if (&vbox->fbdev->afb == vbox_fb)
-		vbox_fbdev_set_base(vbox, gpu_addr);
-
-	vbox_crtc->fb_offset = gpu_addr;
-	if (vbox_set_up_input_mapping(vbox)) {
-		struct drm_crtc *crtci;
-
-		list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
-				    head) {
-			vbox_do_modeset(crtci, &crtci->mode);
-		}
-	}
-
-	return 0;
+                 struct drm_framebuffer *old_fb,
+                 struct drm_framebuffer *new_fb,
+                 int x, int y)
+{
+    struct vbox_private *vbox = crtc->dev->dev_private;
+    struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
+    struct drm_gem_object *obj;
+    struct vbox_framebuffer *vbox_fb;
+    struct vbox_bo *bo;
+    int ret;
+    u64 gpu_addr;
+
+    vbox_fb = to_vbox_framebuffer(new_fb);
+    obj = vbox_fb->obj;
+    bo = gem_to_vbox_bo(obj);
+
+    ret = vbox_bo_reserve(bo, false);
+    if (ret)
+        return ret;
+
+    ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_VRAM, &gpu_addr);
+    vbox_bo_unreserve(bo);
+    if (ret)
+        return ret;
+
+    /* Unpin the previous fb.  Do this after the new one has been pinned rather
+     * than before and re-pinning it on failure in case that fails too. */
+    if (old_fb) {
+        vbox_fb = to_vbox_framebuffer(old_fb);
+        obj = vbox_fb->obj;
+        bo = gem_to_vbox_bo(obj);
+        ret = vbox_bo_reserve(bo, false);
+        /* This should never fail, as no one else should be accessing it and we
+         * should be running under the modeset locks. */
+        if (!ret) {
+            vbox_bo_unpin(bo);
+            vbox_bo_unreserve(bo);
+        }
+        else
+        {
+            DRM_ERROR("unable to lock buffer object: error %d\n", ret);
+        }
+    }
+
+    if (&vbox->fbdev->afb == vbox_fb)
+        vbox_fbdev_set_base(vbox, gpu_addr);
+
+    vbox_crtc->fb_offset = gpu_addr;
+    if (vbox_set_up_input_mapping(vbox)) {
+        struct drm_crtc *crtci;
+
+        list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
+                    head) {
+            vbox_do_modeset(crtci, &crtci->mode);
+        }
+    }
+
+    return 0;
 }
 
 static int vbox_crtc_mode_set(struct drm_crtc *crtc,
-			      struct drm_display_mode *mode,
-			      struct drm_display_mode *adjusted_mode,
-			      int x, int y, struct drm_framebuffer *old_fb)
-{
-	struct vbox_private *vbox = crtc->dev->dev_private;
-	int ret = vbox_crtc_set_base(crtc, old_fb, CRTC_FB(crtc), x, y);
-	if (ret)
-		return ret;
-	mutex_lock(&vbox->hw_mutex);
-	vbox_do_modeset(crtc, mode);
-	VBoxHGSMIUpdateInputMapping(vbox->guest_pool, 0, 0,
-				   vbox->input_mapping_width,
-				   vbox->input_mapping_height);
-	mutex_unlock(&vbox->hw_mutex);
-
-	return ret;
+                  struct drm_display_mode *mode,
+                  struct drm_display_mode *adjusted_mode,
+                  int x, int y, struct drm_framebuffer *old_fb)
+{
+    struct vbox_private *vbox = crtc->dev->dev_private;
+    int ret = vbox_crtc_set_base(crtc, old_fb, CRTC_FB(crtc), x, y);
+    if (ret)
+        return ret;
+    mutex_lock(&vbox->hw_mutex);
+    vbox_do_modeset(crtc, mode);
+    VBoxHGSMIUpdateInputMapping(vbox->guest_pool, 0, 0,
+                   vbox->input_mapping_width,
+                   vbox->input_mapping_height);
+    mutex_unlock(&vbox->hw_mutex);
+
+    return ret;
 }
 
 static int vbox_crtc_page_flip(struct drm_crtc *crtc,
-			       struct drm_framebuffer *fb,
+                   struct drm_framebuffer *fb,
 #if RTLNX_VER_MIN(4,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,5)
-			       struct drm_pending_vblank_event *event,
-			       uint32_t page_flip_flags,
-			       struct drm_modeset_acquire_ctx *ctx)
+                   struct drm_pending_vblank_event *event,
+                   uint32_t page_flip_flags,
+                   struct drm_modeset_acquire_ctx *ctx)
 #elif RTLNX_VER_MIN(3,12,0) || RTLNX_RHEL_MAJ_PREREQ(7,0)
-			       struct drm_pending_vblank_event *event,
-			       uint32_t page_flip_flags)
-#else
-			       struct drm_pending_vblank_event *event)
-#endif
-{
-	struct vbox_private *vbox = crtc->dev->dev_private;
-	struct drm_device *drm = vbox->dev;
-	unsigned long flags;
-	int rc;
-
-	rc = vbox_crtc_set_base(crtc, CRTC_FB(crtc), fb, 0, 0);
-	if (rc)
-		return rc;
-
-	mutex_lock(&vbox->hw_mutex);
-	vbox_do_modeset(crtc, &crtc->mode);
-	mutex_unlock(&vbox->hw_mutex);
-
-	spin_lock_irqsave(&drm->event_lock, flags);
-
-	if (event)
+                   struct drm_pending_vblank_event *event,
+                   uint32_t page_flip_flags)
+#else
+                   struct drm_pending_vblank_event *event)
+#endif
+{
+    struct vbox_private *vbox = crtc->dev->dev_private;
+    struct drm_device *drm = vbox->dev;
+    unsigned long flags;
+    int rc;
+
+    rc = vbox_crtc_set_base(crtc, CRTC_FB(crtc), fb, 0, 0);
+    if (rc)
+        return rc;
+
+    mutex_lock(&vbox->hw_mutex);
+    vbox_do_modeset(crtc, &crtc->mode);
+    mutex_unlock(&vbox->hw_mutex);
+
+    spin_lock_irqsave(&drm->event_lock, flags);
+
+    if (event)
 #if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
-		drm_crtc_send_vblank_event(crtc, event);
-#else
-		drm_send_vblank_event(drm, -1, event);
-#endif
-
-	spin_unlock_irqrestore(&drm->event_lock, flags);
-
-	return 0;
+        drm_crtc_send_vblank_event(crtc, event);
+#else
+        drm_send_vblank_event(drm, -1, event);
+#endif
+
+    spin_unlock_irqrestore(&drm->event_lock, flags);
+
+    return 0;
 }
 
@@ -348,10 +348,10 @@
 
 static const struct drm_crtc_helper_funcs vbox_crtc_helper_funcs = {
-	.dpms = vbox_crtc_dpms,
-	.mode_fixup = vbox_crtc_mode_fixup,
-	.mode_set = vbox_crtc_mode_set,
-	.disable = vbox_crtc_disable,
-	.prepare = vbox_crtc_prepare,
-	.commit = vbox_crtc_commit,
+    .dpms = vbox_crtc_dpms,
+    .mode_fixup = vbox_crtc_mode_fixup,
+    .mode_set = vbox_crtc_mode_set,
+    .disable = vbox_crtc_disable,
+    .prepare = vbox_crtc_prepare,
+    .commit = vbox_crtc_commit,
 };
 
@@ -362,39 +362,39 @@
 static void vbox_crtc_destroy(struct drm_crtc *crtc)
 {
-	drm_crtc_cleanup(crtc);
-	kfree(crtc);
+    drm_crtc_cleanup(crtc);
+    kfree(crtc);
 }
 
 static const struct drm_crtc_funcs vbox_crtc_funcs = {
-	.cursor_move = vbox_cursor_move,
-	.cursor_set2 = vbox_cursor_set2,
-	.reset = vbox_crtc_reset,
-	.set_config = drm_crtc_helper_set_config,
-	/* .gamma_set = vbox_crtc_gamma_set, */
-	.page_flip = vbox_crtc_page_flip,
-	.destroy = vbox_crtc_destroy,
+    .cursor_move = vbox_cursor_move,
+    .cursor_set2 = vbox_cursor_set2,
+    .reset = vbox_crtc_reset,
+    .set_config = drm_crtc_helper_set_config,
+    /* .gamma_set = vbox_crtc_gamma_set, */
+    .page_flip = vbox_crtc_page_flip,
+    .destroy = vbox_crtc_destroy,
 };
 
 static struct vbox_crtc *vbox_crtc_init(struct drm_device *dev, unsigned int i)
 {
-	struct vbox_crtc *vbox_crtc;
-
-	vbox_crtc = kzalloc(sizeof(*vbox_crtc), GFP_KERNEL);
-	if (!vbox_crtc)
-		return NULL;
-
-	vbox_crtc->crtc_id = i;
-
-	drm_crtc_init(dev, &vbox_crtc->base, &vbox_crtc_funcs);
-	drm_mode_crtc_set_gamma_size(&vbox_crtc->base, 256);
-	drm_crtc_helper_add(&vbox_crtc->base, &vbox_crtc_helper_funcs);
-
-	return vbox_crtc;
+    struct vbox_crtc *vbox_crtc;
+
+    vbox_crtc = kzalloc(sizeof(*vbox_crtc), GFP_KERNEL);
+    if (!vbox_crtc)
+        return NULL;
+
+    vbox_crtc->crtc_id = i;
+
+    drm_crtc_init(dev, &vbox_crtc->base, &vbox_crtc_funcs);
+    drm_mode_crtc_set_gamma_size(&vbox_crtc->base, 256);
+    drm_crtc_helper_add(&vbox_crtc->base, &vbox_crtc_helper_funcs);
+
+    return vbox_crtc;
 }
 
 static void vbox_encoder_destroy(struct drm_encoder *encoder)
 {
-	drm_encoder_cleanup(encoder);
-	kfree(encoder);
+    drm_encoder_cleanup(encoder);
+    kfree(encoder);
 }
 
@@ -402,13 +402,13 @@
 static struct drm_encoder *drm_encoder_find(struct drm_device *dev, u32 id)
 {
-	struct drm_mode_object *mo;
-
-	mo = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER);
-	return mo ? obj_to_encoder(mo) : NULL;
+    struct drm_mode_object *mo;
+
+    mo = drm_mode_object_find(dev, id, DRM_MODE_OBJECT_ENCODER);
+    return mo ? obj_to_encoder(mo) : NULL;
 }
 #endif
 
 static struct drm_encoder *vbox_best_single_encoder(struct drm_connector
-						    *connector)
+                            *connector)
 {
 #if RTLNX_VER_MIN(5,5,0) || RTLNX_RHEL_MIN(8,3) || RTLNX_SUSE_MAJ_PREREQ(15,3)
@@ -419,19 +419,19 @@
             return encoder;
 #else /* < 5.5 || RHEL < 8.3 */
-	int enc_id = connector->encoder_ids[0];
-
-	/* pick the encoder ids */
-	if (enc_id)
+    int enc_id = connector->encoder_ids[0];
+
+    /* pick the encoder ids */
+    if (enc_id)
 # if RTLNX_VER_MIN(4,15,0) || RTLNX_RHEL_MAJ_PREREQ(7,6) || (defined(CONFIG_SUSE_VERSION) && RTLNX_VER_MIN(4,12,0))
-		return drm_encoder_find(connector->dev, NULL, enc_id);
+        return drm_encoder_find(connector->dev, NULL, enc_id);
 # else
-		return drm_encoder_find(connector->dev, enc_id);
+        return drm_encoder_find(connector->dev, enc_id);
 # endif
 #endif /* < 5.5 || RHEL < 8.3 */
-	return NULL;
+    return NULL;
 }
 
 static const struct drm_encoder_funcs vbox_enc_funcs = {
-	.destroy = vbox_encoder_destroy,
+    .destroy = vbox_encoder_destroy,
 };
 
@@ -441,13 +441,13 @@
 
 static bool vbox_mode_fixup(struct drm_encoder *encoder,
-			    const struct drm_display_mode *mode,
-			    struct drm_display_mode *adjusted_mode)
-{
-	return true;
+                const struct drm_display_mode *mode,
+                struct drm_display_mode *adjusted_mode)
+{
+    return true;
 }
 
 static void vbox_encoder_mode_set(struct drm_encoder *encoder,
-				  struct drm_display_mode *mode,
-				  struct drm_display_mode *adjusted_mode)
+                  struct drm_display_mode *mode,
+                  struct drm_display_mode *adjusted_mode)
 {
 }
@@ -462,30 +462,30 @@
 
 static const struct drm_encoder_helper_funcs vbox_enc_helper_funcs = {
-	.dpms = vbox_encoder_dpms,
-	.mode_fixup = vbox_mode_fixup,
-	.prepare = vbox_encoder_prepare,
-	.commit = vbox_encoder_commit,
-	.mode_set = vbox_encoder_mode_set,
+    .dpms = vbox_encoder_dpms,
+    .mode_fixup = vbox_mode_fixup,
+    .prepare = vbox_encoder_prepare,
+    .commit = vbox_encoder_commit,
+    .mode_set = vbox_encoder_mode_set,
 };
 
 static struct drm_encoder *vbox_encoder_init(struct drm_device *dev,
-					     unsigned int i)
-{
-	struct vbox_encoder *vbox_encoder;
-
-	vbox_encoder = kzalloc(sizeof(*vbox_encoder), GFP_KERNEL);
-	if (!vbox_encoder)
-		return NULL;
-
-	drm_encoder_init(dev, &vbox_encoder->base, &vbox_enc_funcs,
+                         unsigned int i)
+{
+    struct vbox_encoder *vbox_encoder;
+
+    vbox_encoder = kzalloc(sizeof(*vbox_encoder), GFP_KERNEL);
+    if (!vbox_encoder)
+        return NULL;
+
+    drm_encoder_init(dev, &vbox_encoder->base, &vbox_enc_funcs,
 #if RTLNX_VER_MIN(4,5,0) || RTLNX_RHEL_MAJ_PREREQ(7,3)
-			 DRM_MODE_ENCODER_DAC, NULL);
-#else
-			 DRM_MODE_ENCODER_DAC);
-#endif
-	drm_encoder_helper_add(&vbox_encoder->base, &vbox_enc_helper_funcs);
-
-	vbox_encoder->base.possible_crtcs = 1 << i;
-	return &vbox_encoder->base;
+             DRM_MODE_ENCODER_DAC, NULL);
+#else
+             DRM_MODE_ENCODER_DAC);
+#endif
+    drm_encoder_helper_add(&vbox_encoder->base, &vbox_enc_helper_funcs);
+
+    vbox_encoder->base.possible_crtcs = 1 << i;
+    return &vbox_encoder->base;
 }
 
@@ -497,69 +497,69 @@
  */
 static void vbox_set_edid(struct drm_connector *connector, int width,
-			  int height)
-{
-	enum { EDID_SIZE = 128 };
-	unsigned char edid[EDID_SIZE] = {
-		0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00,	/* header */
-		0x58, 0x58,	/* manufacturer (VBX) */
-		0x00, 0x00,	/* product code */
-		0x00, 0x00, 0x00, 0x00,	/* serial number goes here */
-		0x01,		/* week of manufacture */
-		0x00,		/* year of manufacture */
-		0x01, 0x03,	/* EDID version */
-		0x80,		/* capabilities - digital */
-		0x00,		/* horiz. res in cm, zero for projectors */
-		0x00,		/* vert. res in cm */
-		0x78,		/* display gamma (120 == 2.2). */
-		0xEE,		/* features (standby, suspend, off, RGB, std */
-				/* colour space, preferred timing mode) */
-		0xEE, 0x91, 0xA3, 0x54, 0x4C, 0x99, 0x26, 0x0F, 0x50, 0x54,
-		/* chromaticity for standard colour space. */
-		0x00, 0x00, 0x00,	/* no default timings */
-		0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-		    0x01, 0x01,
-		0x01, 0x01, 0x01, 0x01,	/* no standard timings */
-		0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x00, 0x02, 0x02,
-		    0x02, 0x02,
-		/* descriptor block 1 goes below */
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		/* descriptor block 2, monitor ranges */
-		0x00, 0x00, 0x00, 0xFD, 0x00,
-		0x00, 0xC8, 0x00, 0xC8, 0x64, 0x00, 0x0A, 0x20, 0x20, 0x20,
-		    0x20, 0x20,
-		/* 0-200Hz vertical, 0-200KHz horizontal, 1000MHz pixel clock */
-		0x20,
-		/* descriptor block 3, monitor name */
-		0x00, 0x00, 0x00, 0xFC, 0x00,
-		'V', 'B', 'O', 'X', ' ', 'm', 'o', 'n', 'i', 't', 'o', 'r',
-		'\n',
-		/* descriptor block 4: dummy data */
-		0x00, 0x00, 0x00, 0x10, 0x00,
-		0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-		0x20,
-		0x00,		/* number of extensions */
-		0x00		/* checksum goes here */
-	};
-	int clock = (width + 6) * (height + 6) * 60 / 10000;
-	unsigned int i, sum = 0;
-
-	edid[12] = width & 0xff;
-	edid[13] = width >> 8;
-	edid[14] = height & 0xff;
-	edid[15] = height >> 8;
-	edid[54] = clock & 0xff;
-	edid[55] = clock >> 8;
-	edid[56] = width & 0xff;
-	edid[58] = (width >> 4) & 0xf0;
-	edid[59] = height & 0xff;
-	edid[61] = (height >> 4) & 0xf0;
-	for (i = 0; i < EDID_SIZE - 1; ++i)
-		sum += edid[i];
-	edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
+              int height)
+{
+    enum { EDID_SIZE = 128 };
+    unsigned char edid[EDID_SIZE] = {
+        0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, /* header */
+        0x58, 0x58, /* manufacturer (VBX) */
+        0x00, 0x00, /* product code */
+        0x00, 0x00, 0x00, 0x00, /* serial number goes here */
+        0x01,       /* week of manufacture */
+        0x00,       /* year of manufacture */
+        0x01, 0x03, /* EDID version */
+        0x80,       /* capabilities - digital */
+        0x00,       /* horiz. res in cm, zero for projectors */
+        0x00,       /* vert. res in cm */
+        0x78,       /* display gamma (120 == 2.2). */
+        0xEE,       /* features (standby, suspend, off, RGB, std */
+                /* colour space, preferred timing mode) */
+        0xEE, 0x91, 0xA3, 0x54, 0x4C, 0x99, 0x26, 0x0F, 0x50, 0x54,
+        /* chromaticity for standard colour space. */
+        0x00, 0x00, 0x00,   /* no default timings */
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+            0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, /* no standard timings */
+        0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x06, 0x00, 0x02, 0x02,
+            0x02, 0x02,
+        /* descriptor block 1 goes below */
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        /* descriptor block 2, monitor ranges */
+        0x00, 0x00, 0x00, 0xFD, 0x00,
+        0x00, 0xC8, 0x00, 0xC8, 0x64, 0x00, 0x0A, 0x20, 0x20, 0x20,
+            0x20, 0x20,
+        /* 0-200Hz vertical, 0-200KHz horizontal, 1000MHz pixel clock */
+        0x20,
+        /* descriptor block 3, monitor name */
+        0x00, 0x00, 0x00, 0xFC, 0x00,
+        'V', 'B', 'O', 'X', ' ', 'm', 'o', 'n', 'i', 't', 'o', 'r',
+        '\n',
+        /* descriptor block 4: dummy data */
+        0x00, 0x00, 0x00, 0x10, 0x00,
+        0x0A, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x20,
+        0x00,       /* number of extensions */
+        0x00        /* checksum goes here */
+    };
+    int clock = (width + 6) * (height + 6) * 60 / 10000;
+    unsigned int i, sum = 0;
+
+    edid[12] = width & 0xff;
+    edid[13] = width >> 8;
+    edid[14] = height & 0xff;
+    edid[15] = height >> 8;
+    edid[54] = clock & 0xff;
+    edid[55] = clock >> 8;
+    edid[56] = width & 0xff;
+    edid[58] = (width >> 4) & 0xf0;
+    edid[59] = height & 0xff;
+    edid[61] = (height >> 4) & 0xf0;
+    for (i = 0; i < EDID_SIZE - 1; ++i)
+        sum += edid[i];
+    edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
 #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
-	drm_connector_update_edid_property(connector, (struct edid *)edid);
-#else
-	drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
+    drm_connector_update_edid_property(connector, (struct edid *)edid);
+#else
+    drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
 #endif
 }
@@ -567,72 +567,72 @@
 static int vbox_get_modes(struct drm_connector *connector)
 {
-	struct vbox_connector *vbox_connector = NULL;
-	struct drm_display_mode *mode = NULL;
-	struct vbox_private *vbox = NULL;
-	unsigned int num_modes = 0;
-	int preferred_width, preferred_height;
-
-	vbox_connector = to_vbox_connector(connector);
-	vbox = connector->dev->dev_private;
-	/*
-	 * Heuristic: we do not want to tell the host that we support dynamic
-	 * resizing unless we feel confident that the user space client using
-	 * the video driver can handle hot-plug events.  So the first time modes
-	 * are queried after a "master" switch we tell the host that we do not,
-	 * and immediately after we send the client a hot-plug notification as
-	 * a test to see if they will respond and query again.
-	 * That is also the reason why capabilities are reported to the host at
-	 * this place in the code rather than elsewhere.
-	 * We need to report the flags location before reporting the IRQ
-	 * capability.
-	 */
-	VBoxHGSMIReportFlagsLocation(vbox->guest_pool, GUEST_HEAP_OFFSET(vbox) +
-				    HOST_FLAGS_OFFSET);
-	if (vbox_connector->vbox_crtc->crtc_id == 0)
-		vbox_report_caps(vbox);
-	if (!vbox->initial_mode_queried) {
-		if (vbox_connector->vbox_crtc->crtc_id == 0) {
-			vbox->initial_mode_queried = true;
-			vbox_report_hotplug(vbox);
-		}
-		return drm_add_modes_noedid(connector, 800, 600);
-	}
-	/* Also assume that a client which supports hot-plugging also knows
-	 * how to update the screen in a way we can use, the only known
-	 * relevent client which cannot is Plymouth in Ubuntu 14.04. */
-	vbox->need_refresh_timer = false;
-	num_modes = drm_add_modes_noedid(connector, 2560, 1600);
-	preferred_width = vbox_connector->mode_hint.width ?
-			  vbox_connector->mode_hint.width : 1024;
-	preferred_height = vbox_connector->mode_hint.height ?
-			   vbox_connector->mode_hint.height : 768;
-	mode = drm_cvt_mode(connector->dev, preferred_width, preferred_height,
-			    60, false, false, false);
-	if (mode) {
-		mode->type |= DRM_MODE_TYPE_PREFERRED;
-		drm_mode_probed_add(connector, mode);
-		++num_modes;
-	}
-	vbox_set_edid(connector, preferred_width, preferred_height);
+    struct vbox_connector *vbox_connector = NULL;
+    struct drm_display_mode *mode = NULL;
+    struct vbox_private *vbox = NULL;
+    unsigned int num_modes = 0;
+    int preferred_width, preferred_height;
+
+    vbox_connector = to_vbox_connector(connector);
+    vbox = connector->dev->dev_private;
+    /*
+     * Heuristic: we do not want to tell the host that we support dynamic
+     * resizing unless we feel confident that the user space client using
+     * the video driver can handle hot-plug events.  So the first time modes
+     * are queried after a "master" switch we tell the host that we do not,
+     * and immediately after we send the client a hot-plug notification as
+     * a test to see if they will respond and query again.
+     * That is also the reason why capabilities are reported to the host at
+     * this place in the code rather than elsewhere.
+     * We need to report the flags location before reporting the IRQ
+     * capability.
+     */
+    VBoxHGSMIReportFlagsLocation(vbox->guest_pool, GUEST_HEAP_OFFSET(vbox) +
+                    HOST_FLAGS_OFFSET);
+    if (vbox_connector->vbox_crtc->crtc_id == 0)
+        vbox_report_caps(vbox);
+    if (!vbox->initial_mode_queried) {
+        if (vbox_connector->vbox_crtc->crtc_id == 0) {
+            vbox->initial_mode_queried = true;
+            vbox_report_hotplug(vbox);
+        }
+        return drm_add_modes_noedid(connector, 800, 600);
+    }
+    /* Also assume that a client which supports hot-plugging also knows
+     * how to update the screen in a way we can use, the only known
+     * relevent client which cannot is Plymouth in Ubuntu 14.04. */
+    vbox->need_refresh_timer = false;
+    num_modes = drm_add_modes_noedid(connector, 2560, 1600);
+    preferred_width = vbox_connector->mode_hint.width ?
+              vbox_connector->mode_hint.width : 1024;
+    preferred_height = vbox_connector->mode_hint.height ?
+               vbox_connector->mode_hint.height : 768;
+    mode = drm_cvt_mode(connector->dev, preferred_width, preferred_height,
+                60, false, false, false);
+    if (mode) {
+        mode->type |= DRM_MODE_TYPE_PREFERRED;
+        drm_mode_probed_add(connector, mode);
+        ++num_modes;
+    }
+    vbox_set_edid(connector, preferred_width, preferred_height);
 
 #if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
-	if (vbox_connector->vbox_crtc->x_hint != -1)
-		drm_object_property_set_value(&connector->base,
-			vbox->dev->mode_config.suggested_x_property,
-			vbox_connector->vbox_crtc->x_hint);
-	else
-		drm_object_property_set_value(&connector->base,
-			vbox->dev->mode_config.suggested_x_property, 0);
-
-	if (vbox_connector->vbox_crtc->y_hint != -1)
-		drm_object_property_set_value(&connector->base,
-			vbox->dev->mode_config.suggested_y_property,
-			vbox_connector->vbox_crtc->y_hint);
-	else
-		drm_object_property_set_value(&connector->base,
-			vbox->dev->mode_config.suggested_y_property, 0);
-#endif
-
-	return num_modes;
+    if (vbox_connector->vbox_crtc->x_hint != -1)
+        drm_object_property_set_value(&connector->base,
+            vbox->dev->mode_config.suggested_x_property,
+            vbox_connector->vbox_crtc->x_hint);
+    else
+        drm_object_property_set_value(&connector->base,
+            vbox->dev->mode_config.suggested_x_property, 0);
+
+    if (vbox_connector->vbox_crtc->y_hint != -1)
+        drm_object_property_set_value(&connector->base,
+            vbox->dev->mode_config.suggested_y_property,
+            vbox_connector->vbox_crtc->y_hint);
+    else
+        drm_object_property_set_value(&connector->base,
+            vbox->dev->mode_config.suggested_y_property, 0);
+#endif
+
+    return num_modes;
 }
 
@@ -642,7 +642,7 @@
 static enum drm_mode_status vbox_mode_valid(struct drm_connector *connector,
 #endif
-			   struct drm_display_mode *mode)
-{
-	return MODE_OK;
+               struct drm_display_mode *mode)
+{
+    return MODE_OK;
 }
 
@@ -650,10 +650,10 @@
 {
 #if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
-	drm_sysfs_connector_remove(connector);
-#else
-	drm_connector_unregister(connector);
-#endif
-	drm_connector_cleanup(connector);
-	kfree(connector);
+    drm_sysfs_connector_remove(connector);
+#else
+    drm_connector_unregister(connector);
+#endif
+    drm_connector_cleanup(connector);
+    kfree(connector);
 }
 
@@ -661,112 +661,112 @@
 vbox_connector_detect(struct drm_connector *connector, bool force)
 {
-	struct vbox_connector *vbox_connector;
-
-	vbox_connector = to_vbox_connector(connector);
-
-	return vbox_connector->mode_hint.disconnected ?
-	    connector_status_disconnected : connector_status_connected;
+    struct vbox_connector *vbox_connector;
+
+    vbox_connector = to_vbox_connector(connector);
+
+    return vbox_connector->mode_hint.disconnected ?
+        connector_status_disconnected : connector_status_connected;
 }
 
 static int vbox_fill_modes(struct drm_connector *connector, u32 max_x,
-			   u32 max_y)
-{
-	struct vbox_connector *vbox_connector;
-	struct drm_device *dev;
-	struct drm_display_mode *mode, *iterator;
-
-	vbox_connector = to_vbox_connector(connector);
-	dev = vbox_connector->base.dev;
-	list_for_each_entry_safe(mode, iterator, &connector->modes, head) {
-		list_del(&mode->head);
-		drm_mode_destroy(dev, mode);
-	}
-
-	return drm_helper_probe_single_connector_modes(connector, max_x, max_y);
+               u32 max_y)
+{
+    struct vbox_connector *vbox_connector;
+    struct drm_device *dev;
+    struct drm_display_mode *mode, *iterator;
+
+    vbox_connector = to_vbox_connector(connector);
+    dev = vbox_connector->base.dev;
+    list_for_each_entry_safe(mode, iterator, &connector->modes, head) {
+        list_del(&mode->head);
+        drm_mode_destroy(dev, mode);
+    }
+
+    return drm_helper_probe_single_connector_modes(connector, max_x, max_y);
 }
 
 static const struct drm_connector_helper_funcs vbox_connector_helper_funcs = {
-	.mode_valid = vbox_mode_valid,
-	.get_modes = vbox_get_modes,
-	.best_encoder = vbox_best_single_encoder,
+    .mode_valid = vbox_mode_valid,
+    .get_modes = vbox_get_modes,
+    .best_encoder = vbox_best_single_encoder,
 };
 
 static const struct drm_connector_funcs vbox_connector_funcs = {
-	.dpms = drm_helper_connector_dpms,
-	.detect = vbox_connector_detect,
-	.fill_modes = vbox_fill_modes,
-	.destroy = vbox_connector_destroy,
+    .dpms = drm_helper_connector_dpms,
+    .detect = vbox_connector_detect,
+    .fill_modes = vbox_fill_modes,
+    .destroy = vbox_connector_destroy,
 };
 
 static int vbox_connector_init(struct drm_device *dev,
-			       struct vbox_crtc *vbox_crtc,
-			       struct drm_encoder *encoder)
-{
-	struct vbox_connector *vbox_connector;
-	struct drm_connector *connector;
-
-	vbox_connector = kzalloc(sizeof(*vbox_connector), GFP_KERNEL);
-	if (!vbox_connector)
-		return -ENOMEM;
-
-	connector = &vbox_connector->base;
-	vbox_connector->vbox_crtc = vbox_crtc;
-
-	drm_connector_init(dev, connector, &vbox_connector_funcs,
-			   DRM_MODE_CONNECTOR_VGA);
-	drm_connector_helper_add(connector, &vbox_connector_helper_funcs);
-
-	connector->interlace_allowed = 0;
-	connector->doublescan_allowed = 0;
+                   struct vbox_crtc *vbox_crtc,
+                   struct drm_encoder *encoder)
+{
+    struct vbox_connector *vbox_connector;
+    struct drm_connector *connector;
+
+    vbox_connector = kzalloc(sizeof(*vbox_connector), GFP_KERNEL);
+    if (!vbox_connector)
+        return -ENOMEM;
+
+    connector = &vbox_connector->base;
+    vbox_connector->vbox_crtc = vbox_crtc;
+
+    drm_connector_init(dev, connector, &vbox_connector_funcs,
+               DRM_MODE_CONNECTOR_VGA);
+    drm_connector_helper_add(connector, &vbox_connector_helper_funcs);
+
+    connector->interlace_allowed = 0;
+    connector->doublescan_allowed = 0;
 
 #if RTLNX_VER_MIN(3,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,2)
-	drm_mode_create_suggested_offset_properties(dev);
-	drm_object_attach_property(&connector->base,
-				   dev->mode_config.suggested_x_property, 0);
-	drm_object_attach_property(&connector->base,
-				   dev->mode_config.suggested_y_property, 0);
+    drm_mode_create_suggested_offset_properties(dev);
+    drm_object_attach_property(&connector->base,
+                   dev->mode_config.suggested_x_property, 0);
+    drm_object_attach_property(&connector->base,
+                   dev->mode_config.suggested_y_property, 0);
 #endif
 #if RTLNX_VER_MAX(3,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,2)
-	drm_sysfs_connector_add(connector);
-#else
-	drm_connector_register(connector);
+    drm_sysfs_connector_add(connector);
+#else
+    drm_connector_register(connector);
 #endif
 
 #if RTLNX_VER_MIN(4,19,0) || RTLNX_RHEL_MAJ_PREREQ(7,7) || RTLNX_RHEL_MAJ_PREREQ(8,1) || RTLNX_SUSE_MAJ_PREREQ(15,1) || RTLNX_SUSE_MAJ_PREREQ(12,5)
-	drm_connector_attach_encoder(connector, encoder);
-#else
-	drm_mode_connector_attach_encoder(connector, encoder);
-#endif
-
-	return 0;
+    drm_connector_attach_encoder(connector, encoder);
+#else
+    drm_mode_connector_attach_encoder(connector, encoder);
+#endif
+
+    return 0;
 }
 
 int vbox_mode_init(struct drm_device *dev)
 {
-	struct vbox_private *vbox = dev->dev_private;
-	struct drm_encoder *encoder;
-	struct vbox_crtc *vbox_crtc;
-	unsigned int i;
-	int ret;
-
-	/* vbox_cursor_init(dev); */
-	for (i = 0; i < vbox->num_crtcs; ++i) {
-		vbox_crtc = vbox_crtc_init(dev, i);
-		if (!vbox_crtc)
-			return -ENOMEM;
-		encoder = vbox_encoder_init(dev, i);
-		if (!encoder)
-			return -ENOMEM;
-		ret = vbox_connector_init(dev, vbox_crtc, encoder);
-		if (ret)
-			return ret;
-	}
-
-	return 0;
+    struct vbox_private *vbox = dev->dev_private;
+    struct drm_encoder *encoder;
+    struct vbox_crtc *vbox_crtc;
+    unsigned int i;
+    int ret;
+
+    /* vbox_cursor_init(dev); */
+    for (i = 0; i < vbox->num_crtcs; ++i) {
+        vbox_crtc = vbox_crtc_init(dev, i);
+        if (!vbox_crtc)
+            return -ENOMEM;
+        encoder = vbox_encoder_init(dev, i);
+        if (!encoder)
+            return -ENOMEM;
+        ret = vbox_connector_init(dev, vbox_crtc, encoder);
+        if (ret)
+            return ret;
+    }
+
+    return 0;
 }
 
 void vbox_mode_fini(struct drm_device *dev)
 {
-	/* vbox_cursor_fini(dev); */
+    /* vbox_cursor_fini(dev); */
 }
 
@@ -777,173 +777,173 @@
  */
 static void copy_cursor_image(u8 *src, u8 *dst, u32 width, u32 height,
-			      size_t mask_size)
-{
-	size_t line_size = (width + 7) / 8;
-	u32 i, j;
-
-	memcpy(dst + mask_size, src, width * height * 4);
-	for (i = 0; i < height; ++i)
-		for (j = 0; j < width; ++j)
-			if (((u32 *)src)[i * width + j] > 0xf0000000)
-				dst[i * line_size + j / 8] |= (0x80 >> (j % 8));
+                  size_t mask_size)
+{
+    size_t line_size = (width + 7) / 8;
+    u32 i, j;
+
+    memcpy(dst + mask_size, src, width * height * 4);
+    for (i = 0; i < height; ++i)
+        for (j = 0; j < width; ++j)
+            if (((u32 *)src)[i * width + j] > 0xf0000000)
+                dst[i * line_size + j / 8] |= (0x80 >> (j % 8));
 }
 
 static int vbox_cursor_set2(struct drm_crtc *crtc, struct drm_file *file_priv,
-			    u32 handle, u32 width, u32 height,
-			    s32 hot_x, s32 hot_y)
-{
-	struct vbox_private *vbox = crtc->dev->dev_private;
-	struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
-	struct ttm_bo_kmap_obj uobj_map;
-	size_t data_size, mask_size;
-	struct drm_gem_object *obj;
-	u32 flags, caps = 0;
-	struct vbox_bo *bo;
-	bool src_isiomem;
-	u8 *dst = NULL;
-	u8 *src;
-	int ret;
-
-	if (!handle) {
-		bool cursor_enabled = false;
-		struct drm_crtc *crtci;
-
-		/* Hide cursor. */
-		vbox_crtc->cursor_enabled = false;
-		list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
-				    head) {
-			if (to_vbox_crtc(crtci)->cursor_enabled)
-				cursor_enabled = true;
-			}
-
-		if (!cursor_enabled)
-			VBoxHGSMIUpdatePointerShape(vbox->guest_pool, 0, 0, 0,
-						   0, 0, NULL, 0);
-		return 0;
-	}
-
-	vbox_crtc->cursor_enabled = true;
-
-	if (width > VBOX_MAX_CURSOR_WIDTH || height > VBOX_MAX_CURSOR_HEIGHT ||
-	    width == 0 || height == 0)
-		return -EINVAL;
-	ret = VBoxQueryConfHGSMI(vbox->guest_pool,
-				VBOX_VBVA_CONF32_CURSOR_CAPABILITIES, &caps);
-	if (ret)
-		return ret == VERR_NO_MEMORY ? -ENOMEM : -EINVAL;
-
-	if (!(caps & VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE)) {
-		/*
-		 * -EINVAL means cursor_set2() not supported, -EAGAIN means
-		 * retry at once.
-		 */
-		return -EBUSY;
-	}
+                u32 handle, u32 width, u32 height,
+                s32 hot_x, s32 hot_y)
+{
+    struct vbox_private *vbox = crtc->dev->dev_private;
+    struct vbox_crtc *vbox_crtc = to_vbox_crtc(crtc);
+    struct ttm_bo_kmap_obj uobj_map;
+    size_t data_size, mask_size;
+    struct drm_gem_object *obj;
+    u32 flags, caps = 0;
+    struct vbox_bo *bo;
+    bool src_isiomem;
+    u8 *dst = NULL;
+    u8 *src;
+    int ret;
+
+    if (!handle) {
+        bool cursor_enabled = false;
+        struct drm_crtc *crtci;
+
+        /* Hide cursor. */
+        vbox_crtc->cursor_enabled = false;
+        list_for_each_entry(crtci, &vbox->dev->mode_config.crtc_list,
+                    head) {
+            if (to_vbox_crtc(crtci)->cursor_enabled)
+                cursor_enabled = true;
+            }
+
+        if (!cursor_enabled)
+            VBoxHGSMIUpdatePointerShape(vbox->guest_pool, 0, 0, 0,
+                           0, 0, NULL, 0);
+        return 0;
+    }
+
+    vbox_crtc->cursor_enabled = true;
+
+    if (width > VBOX_MAX_CURSOR_WIDTH || height > VBOX_MAX_CURSOR_HEIGHT ||
+        width == 0 || height == 0)
+        return -EINVAL;
+    ret = VBoxQueryConfHGSMI(vbox->guest_pool,
+                VBOX_VBVA_CONF32_CURSOR_CAPABILITIES, &caps);
+    if (ret)
+        return ret == VERR_NO_MEMORY ? -ENOMEM : -EINVAL;
+
+    if (!(caps & VBOX_VBVA_CURSOR_CAPABILITY_HARDWARE)) {
+        /*
+         * -EINVAL means cursor_set2() not supported, -EAGAIN means
+         * retry at once.
+         */
+        return -EBUSY;
+    }
 
 #if RTLNX_VER_MIN(4,7,0) || RTLNX_RHEL_MAJ_PREREQ(7,4)
-	obj = drm_gem_object_lookup(file_priv, handle);
-#else
-	obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
-#endif
-	if (!obj) {
-		DRM_ERROR("Cannot find cursor object %x for crtc\n", handle);
-		return -ENOENT;
-	}
-
-	bo = gem_to_vbox_bo(obj);
-	ret = vbox_bo_reserve(bo, false);
-	if (ret)
-		goto out_unref_obj;
-
-	/*
-	 * The mask must be calculated based on the alpha
-	 * channel, one bit per ARGB word, and must be 32-bit
-	 * padded.
-	 */
-	mask_size = ((width + 7) / 8 * height + 3) & ~3;
-	data_size = width * height * 4 + mask_size;
-	vbox->cursor_hot_x = hot_x;
-	vbox->cursor_hot_y = hot_y;
-	vbox->cursor_width = width;
-	vbox->cursor_height = height;
-	vbox->cursor_data_size = data_size;
-	dst = vbox->cursor_data;
+    obj = drm_gem_object_lookup(file_priv, handle);
+#else
+    obj = drm_gem_object_lookup(crtc->dev, file_priv, handle);
+#endif
+    if (!obj) {
+        DRM_ERROR("Cannot find cursor object %x for crtc\n", handle);
+        return -ENOENT;
+    }
+
+    bo = gem_to_vbox_bo(obj);
+    ret = vbox_bo_reserve(bo, false);
+    if (ret)
+        goto out_unref_obj;
+
+    /*
+     * The mask must be calculated based on the alpha
+     * channel, one bit per ARGB word, and must be 32-bit
+     * padded.
+     */
+    mask_size = ((width + 7) / 8 * height + 3) & ~3;
+    data_size = width * height * 4 + mask_size;
+    vbox->cursor_hot_x = hot_x;
+    vbox->cursor_hot_y = hot_y;
+    vbox->cursor_width = width;
+    vbox->cursor_height = height;
+    vbox->cursor_data_size = data_size;
+    dst = vbox->cursor_data;
 
 #if RTLNX_VER_MIN(6,4,0)
-	/* Make sure bo is in SYSTEM (main) memory, so we can access it directly. */
-	ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_SYSTEM, NULL);
-	if (ret)
-	{
-		DRM_ERROR("cannot pin bo to main memory\n");
-		goto out_bo_unpin;
-	}
+    /* Make sure bo is in SYSTEM (main) memory, so we can access it directly. */
+    ret = vbox_bo_pin(bo, VBOX_MEM_TYPE_SYSTEM, NULL);
+    if (ret)
+    {
+        DRM_ERROR("cannot pin bo to main memory\n");
+        goto out_bo_unpin;
+    }
 #endif
 
 #if RTLNX_VER_MIN(5,14,0) || RTLNX_RHEL_RANGE(8,6, 8,99)
-	ret = ttm_bo_kmap(&bo->bo, 0, VBOX_BO_RESOURCE_NUM_PAGES(bo->bo.resource), &uobj_map);
+    ret = ttm_bo_kmap(&bo->bo, 0, VBOX_BO_RESOURCE_NUM_PAGES(bo->bo.resource), &uobj_map);
 #elif RTLNX_VER_MIN(5,12,0) || RTLNX_RHEL_MAJ_PREREQ(8,5)
-	ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map);
-#else
-	ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map);
-#endif
-	if (ret) {
-		vbox->cursor_data_size = 0;
-		goto out_unreserve_bo;
-	}
-
-	src = ttm_kmap_obj_virtual(&uobj_map, &src_isiomem);
-	if (src_isiomem) {
-		DRM_ERROR("src cursor bo not in main memory\n");
-		ret = -EIO;
-		goto out_unmap_bo;
-	}
-
-	copy_cursor_image(src, dst, width, height, mask_size);
-
-	flags = VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE |
-		VBOX_MOUSE_POINTER_ALPHA;
-	ret = VBoxHGSMIUpdatePointerShape(vbox->guest_pool, flags,
-					 vbox->cursor_hot_x, vbox->cursor_hot_y,
-					 width, height, dst, data_size);
-	ret = ret == VINF_SUCCESS ? 0 : ret == VERR_NO_MEMORY ? -ENOMEM :
-		ret == VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
+    ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.mem.num_pages, &uobj_map);
+#else
+    ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &uobj_map);
+#endif
+    if (ret) {
+        vbox->cursor_data_size = 0;
+        goto out_unreserve_bo;
+    }
+
+    src = ttm_kmap_obj_virtual(&uobj_map, &src_isiomem);
+    if (src_isiomem) {
+        DRM_ERROR("src cursor bo not in main memory\n");
+        ret = -EIO;
+        goto out_unmap_bo;
+    }
+
+    copy_cursor_image(src, dst, width, height, mask_size);
+
+    flags = VBOX_MOUSE_POINTER_VISIBLE | VBOX_MOUSE_POINTER_SHAPE |
+        VBOX_MOUSE_POINTER_ALPHA;
+    ret = VBoxHGSMIUpdatePointerShape(vbox->guest_pool, flags,
+                     vbox->cursor_hot_x, vbox->cursor_hot_y,
+                     width, height, dst, data_size);
+    ret = ret == VINF_SUCCESS ? 0 : ret == VERR_NO_MEMORY ? -ENOMEM :
+        ret == VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
 
 out_unmap_bo:
-	ttm_bo_kunmap(&uobj_map);
+    ttm_bo_kunmap(&uobj_map);
 #if RTLNX_VER_MIN(6,4,0)
 out_bo_unpin:
-	vbox_bo_unpin(bo);
+    vbox_bo_unpin(bo);
 #endif
 out_unreserve_bo:
-	vbox_bo_unreserve(bo);
+    vbox_bo_unreserve(bo);
 out_unref_obj:
 #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) || RTLNX_SUSE_MAJ_PREREQ(15,3)
-	drm_gem_object_put(obj);
-#else
-	drm_gem_object_put_unlocked(obj);
-#endif
-
-	return ret;
+    drm_gem_object_put(obj);
+#else
+    drm_gem_object_put_unlocked(obj);
+#endif
+
+    return ret;
 }
 
 static int vbox_cursor_move(struct drm_crtc *crtc, int x, int y)
 {
-	struct vbox_private *vbox = crtc->dev->dev_private;
-	s32 crtc_x =
-	    vbox->single_framebuffer ? crtc->x : to_vbox_crtc(crtc)->x_hint;
-	s32 crtc_y =
-	    vbox->single_framebuffer ? crtc->y : to_vbox_crtc(crtc)->y_hint;
-	int ret;
-
-	x += vbox->cursor_hot_x;
-	y += vbox->cursor_hot_y;
-	if (x + crtc_x < 0 || y + crtc_y < 0 ||
-		x + crtc_x >= vbox->input_mapping_width ||
-		y + crtc_y >= vbox->input_mapping_width ||
-		vbox->cursor_data_size == 0)
-		return 0;
-	ret = VBoxHGSMICursorPosition(vbox->guest_pool, true, x + crtc_x,
-					 y + crtc_y, NULL, NULL);
-	return ret == VINF_SUCCESS ? 0 : ret == VERR_NO_MEMORY ? -ENOMEM : ret ==
-		VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
-}
+    struct vbox_private *vbox = crtc->dev->dev_private;
+    s32 crtc_x =
+        vbox->single_framebuffer ? crtc->x : to_vbox_crtc(crtc)->x_hint;
+    s32 crtc_y =
+        vbox->single_framebuffer ? crtc->y : to_vbox_crtc(crtc)->y_hint;
+    int ret;
+
+    x += vbox->cursor_hot_x;
+    y += vbox->cursor_hot_y;
+    if (x + crtc_x < 0 || y + crtc_y < 0 ||
+        x + crtc_x >= vbox->input_mapping_width ||
+        y + crtc_y >= vbox->input_mapping_width ||
+        vbox->cursor_data_size == 0)
+        return 0;
+    ret = VBoxHGSMIReportCursorPosition(vbox->guest_pool, true, x + crtc_x,
+                                        y + crtc_y, NULL, NULL);
+    return ret == VINF_SUCCESS ? 0 : ret == VERR_NO_MEMORY ? -ENOMEM : ret ==
+        VERR_NOT_SUPPORTED ? -EBUSY : -EINVAL;
+}
Index: /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
--- /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c	(revision 104833)
+++ /trunk/src/VBox/Additions/x11/vboxvideo/pointer.c	(revision 104834)
@@ -192,6 +192,5 @@
     VBOXPtr pVBox = pScrn->driverPrivate;
 
-    /* This currently does nothing. */
-    VBoxHGSMICursorPosition(&pVBox->guestCtx, true, x, y, NULL, NULL);
+    VBoxHGSMIReportCursorPosition(&pVBox->guestCtx, true, x, y, NULL, NULL);
 }
 
