From: Thomas Hellstrom <thellstrom@vmware.com>
To: "hch@lst.de" <hch@lst.de>
Cc: Linux-graphics-maintainer <Linux-graphics-maintainer@vmware.com>,
"dri-devel@lists.freedesktop.org"
<dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs v2
Date: Mon, 4 Feb 2019 12:11:39 +0000 [thread overview]
Message-ID: <1f22fa519670f7caa3c2f4f48d7cb6daf79d6eb0.camel@vmware.com> (raw)
In-Reply-To: <20190204081932.GB5730@lst.de>
On Mon, 2019-02-04 at 09:19 +0100, Christoph Hellwig wrote:
> On Fri, Jan 25, 2019 at 09:12:13AM +0100, Thomas Hellstrom wrote:
> > -#if !defined(CONFIG_SWIOTLB) && !defined(CONFIG_INTEL_IOMMU)
> > - /*
> > - * No coherent page pool
> > - */
> > - if (dev_priv->map_mode == vmw_dma_alloc_coherent)
> > + /* No TTM coherent page pool? FIXME: Ask TTM instead! */
> > + if (!(IS_ENABLED(CONFIG_SWIOTLB) ||
> > IS_ENABLED(CONFIG_INTEL_IOMMU)) &&
> > + (dev_priv->map_mode == vmw_dma_alloc_coherent))
> > return -EINVAL;
> > -#endif
> > +
>
> I don't think this edited in change makes any sense. The swiotlb vs
> dma-direct versions of dma_alloc_coherent are the same, so this check
> seems very obsfucating.
So this part of code is identical in functionality to the previous
version. It checks whether the TTM module has the coherent page pool
enabled. (an identical test is present in TTM). What we *really* need
to do here instead is to ask TTM whether it has enabled its coherent
page pool instead of trying to mimic TTM's test, and I have a changeset
under review for that. But as mentioned previously, I don't want to
change the TTM interface outside of a merge window, so we either have
to live with the above for 5.0 or keep the old defines. I'd prefer the
former so I don't have to respin the patch series once more.
Thanks,
Thoams
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-02-04 12:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 8:12 [PATCH 0/4] Fix DMA ops layering violations in vmwgfx v2 Thomas Hellstrom
2019-01-25 8:12 ` [PATCH 1/4] drm/vmwgfx: remove CONFIG_X86 ifdefs Thomas Hellstrom
2019-01-25 8:12 ` [PATCH 2/4] drm/vmwgfx: remove CONFIG_INTEL_IOMMU ifdefs v2 Thomas Hellstrom
[not found] ` <20190204081932.GB5730@lst.de>
2019-02-04 12:11 ` Thomas Hellstrom [this message]
2019-01-25 8:12 ` [PATCH 3/4] drm/vmwgfx: fix the check when to use dma_alloc_coherent Thomas Hellstrom
2019-01-25 8:12 ` [PATCH 4/4] drm/vmwgfx: unwind spaghetti code in vmw_dma_select_mode 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=1f22fa519670f7caa3c2f4f48d7cb6daf79d6eb0.camel@vmware.com \
--to=thellstrom@vmware.com \
--cc=Linux-graphics-maintainer@vmware.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hch@lst.de \
/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