dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: rscheidegger.oss@gmail.com
To: dri-devel@lists.freedesktop.org
Cc: linux-graphics-maintainer@vmware.com
Subject: [PATCH 07/17] drm/vmwgfx: Read new register for GB memory when available
Date: Thu, 19 Mar 2020 21:24:04 +0100	[thread overview]
Message-ID: <20200319202414.9296-8-sroland@vmware.com> (raw)
In-Reply-To: <20200319202414.9296-1-sroland@vmware.com>

From: Deepak Rawat <drawat.floss@gmail.com>

Virtual device added new register for suggested GB memory, read the new
register when available.

Signed-off-by: Deepak Rawat <drawat.floss@gmail.com>
Reviewed-by: Thomas Hellström (VMware) <thomas_os@shipmail.org>
Signed-off-by: Roland Scheidegger (VMware) <rscheidegger.oss@gmail.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index e07292a29c26..6b8ea0efa3f0 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -720,9 +720,15 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
 	dev_priv->max_mob_pages = 0;
 	dev_priv->max_mob_size = 0;
 	if (dev_priv->capabilities & SVGA_CAP_GBOBJECTS) {
-		uint64_t mem_size =
-			vmw_read(dev_priv,
-				 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
+		uint64_t mem_size;
+
+		if (dev_priv->capabilities2 & SVGA_CAP2_GB_MEMSIZE_2)
+			mem_size = vmw_read(dev_priv,
+					    SVGA_REG_GBOBJECT_MEM_SIZE_KB);
+		else
+			mem_size =
+				vmw_read(dev_priv,
+					 SVGA_REG_SUGGESTED_GBOBJECT_MEM_SIZE_KB);
 
 		/*
 		 * Workaround for low memory 2D VMs to compensate for the
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2020-03-19 20:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19 20:23 [PATCH 00/17] drm/vmwgfx add support for GL4 rscheidegger.oss
2020-03-19 20:23 ` [PATCH 01/17] drm/vmwgfx: Also check for SVGA_CAP_DX before reading DX context support rscheidegger.oss
2020-03-19 20:23 ` [PATCH 02/17] drm/vmwgfx: Sync legacy multisampling device capability rscheidegger.oss
2020-03-19 20:24 ` [PATCH 03/17] drm/vmwgfx: Deprecate logic ops commands rscheidegger.oss
2020-03-19 20:24 ` [PATCH 04/17] drm/vmwgfx: Use enum to represent graphics context capabilities rscheidegger.oss
2020-03-19 20:24 ` [PATCH 05/17] drm/vmwgfx: Sync virtual device headers for new feature rscheidegger.oss
2020-03-19 20:24 ` [PATCH 06/17] drm/vmwgfx: Add a new enum for SM5 graphics context capability rscheidegger.oss
2020-03-19 20:24 ` rscheidegger.oss [this message]
2020-03-19 20:24 ` [PATCH 08/17] drm/vmwgfx: Support SM5 shader type in command buffer rscheidegger.oss
2020-03-19 20:24 ` [PATCH 09/17] drm/vmwgfx: Add support for UA view commands rscheidegger.oss
2020-03-19 20:24 ` [PATCH 10/17] drm/vmwgfx: Add support for indirect and dispatch commands rscheidegger.oss
2020-03-19 20:24 ` [PATCH 11/17] drm/vmwgfx: Rename stream output target binding tracker struct rscheidegger.oss
2020-03-19 20:24 ` [PATCH 12/17] drm/vmwgfx: Add support for streamoutput with mob commands rscheidegger.oss
2020-03-19 20:24 ` [PATCH 13/17] drm/vmwgfx: Split surface metadata from struct vmw_surface rscheidegger.oss
2020-03-19 20:24 ` [PATCH 14/17] drm/vmwgfx: Refactor surface_define to use vmw_surface_metadata rscheidegger.oss
2020-03-19 20:24 ` [PATCH 15/17] drm/vmwgfx: Add surface define v4 command rscheidegger.oss
2020-03-23 12:02   ` Emil Velikov
2020-03-23 17:02     ` Roland Scheidegger
2020-03-19 20:24 ` [PATCH 16/17] drm/vmwgfx: Add SM5 param for userspace rscheidegger.oss
2020-03-19 20:24 ` [PATCH 17/17] drm/vmwgfx: Use vmwgfx version 2.18 to signal SM5 compatibility rscheidegger.oss

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200319202414.9296-8-sroland@vmware.com \
    --to=rscheidegger.oss@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-graphics-maintainer@vmware.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).