Linux IOMMU Development
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: thellstrom@vmware.com
Cc: iommu@lists.linux-foundation.org,
	linux-graphics-maintainer@vmware.com,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode
Date: Sat,  5 Jan 2019 09:01:08 +0100	[thread overview]
Message-ID: <20190105080108.14837-5-hch@lst.de> (raw)
In-Reply-To: <20190105080108.14837-1-hch@lst.de>

Just use a simple if/else chain to select the DMA mode.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index c2060f6cc9e8..86387735a90b 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -566,34 +566,21 @@ static int vmw_dma_select_mode(struct vmw_private *dev_priv)
 		[vmw_dma_map_populate] = "Keeping DMA mappings.",
 		[vmw_dma_map_bind] = "Giving up DMA mappings early."};
 
-	if (intel_iommu_enabled) {
+	if (vmw_force_coherent)
+		dev_priv->map_mode = vmw_dma_alloc_coherent;
+	else if (intel_iommu_enabled)
 		dev_priv->map_mode = vmw_dma_map_populate;
-		goto out_fixup;
-	}
-
-	if (!(vmw_force_iommu || vmw_force_coherent)) {
+	else if (!vmw_force_iommu)
 		dev_priv->map_mode = vmw_dma_phys;
-		DRM_INFO("DMA map mode: %s\n", names[dev_priv->map_mode]);
-		return 0;
-	}
-
-#ifdef CONFIG_SWIOTLB
-	if (swiotlb_nr_tbl())
+	else if (IS_ENABLED(CONFIG_SWIOTLB) && swiotlb_nr_tbl())
 		dev_priv->map_mode = vmw_dma_alloc_coherent;
 	else
-#endif
 		dev_priv->map_mode = vmw_dma_map_populate;
 
-out_fixup:
-	if (dev_priv->map_mode == vmw_dma_map_populate &&
-	    vmw_restrict_iommu)
+	if (dev_priv->map_mode == vmw_dma_map_populate && vmw_restrict_iommu)
 		dev_priv->map_mode = vmw_dma_map_bind;
 
-	if (vmw_force_coherent)
-		dev_priv->map_mode = vmw_dma_alloc_coherent;
-
 	DRM_INFO("DMA map mode: %s\n", names[dev_priv->map_mode]);
-
 	return 0;
 }
 
-- 
2.20.1

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

  parent reply	other threads:[~2019-01-05  8:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-05  8:01 fix DMA ops layering violations in vmwgfx Christoph Hellwig
2019-01-05  8:01 ` [PATCH 1/4] drm/vmwgfx: remove CONFIG_X86 ifdefs Christoph Hellwig
2019-01-05  8:01 ` [PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs Christoph Hellwig
2019-01-08 10:03   ` Thomas Hellstrom
     [not found]   ` <20190105080108.14837-3-hch-jcswGhMUV9g@public.gmane.org>
2019-01-08 10:55     ` Thomas Hellstrom
2019-01-05  8:01 ` [PATCH 3/4] drm/vmwgfx: fix the check when to use dma_alloc_coherent Christoph Hellwig
2019-01-05  8:01 ` Christoph Hellwig [this message]
     [not found]   ` <20190105080108.14837-5-hch-jcswGhMUV9g@public.gmane.org>
2019-01-08 10:56     ` [PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode Thomas Hellstrom
2019-01-08  9:51 ` fix DMA ops layering violations in vmwgfx Thomas Hellstrom
     [not found]   ` <99091bb861e21d5bb4182f08dedbc494c637cc0f.camel-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>
2019-01-08 13:12     ` hch-jcswGhMUV9g
     [not found]       ` <20190108131227.GB6003-jcswGhMUV9g@public.gmane.org>
2019-01-08 18:25         ` Thomas Hellstrom

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=20190105080108.14837-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linux-graphics-maintainer@vmware.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=thellstrom@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