2005-04-16 16:20:36 -06:00
|
|
|
/*
|
2007-10-19 15:21:04 -06:00
|
|
|
* Copyright 2003 José Fonseca.
|
2005-04-16 16:20:36 -06:00
|
|
|
* Copyright 2003 Leif Delgass.
|
|
|
|
* All Rights Reserved.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/pci.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 02:04:11 -06:00
|
|
|
#include <linux/slab.h>
|
2006-04-05 02:12:18 -06:00
|
|
|
#include <linux/dma-mapping.h>
|
2011-08-30 16:16:33 -06:00
|
|
|
#include <linux/export.h>
|
2017-03-08 07:12:37 -07:00
|
|
|
#include <drm/drm_pci.h>
|
2012-10-02 11:01:07 -06:00
|
|
|
#include <drm/drmP.h>
|
2015-03-13 06:51:25 -06:00
|
|
|
#include "drm_internal.h"
|
2014-09-10 23:43:25 -06:00
|
|
|
#include "drm_legacy.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/**
|
2014-05-19 05:39:07 -06:00
|
|
|
* drm_pci_alloc - Allocate a PCI consistent memory block, for DMA.
|
|
|
|
* @dev: DRM device
|
|
|
|
* @size: size of block to allocate
|
|
|
|
* @align: alignment of block
|
|
|
|
*
|
2017-03-08 07:12:37 -07:00
|
|
|
* FIXME: This is a needless abstraction of the Linux dma-api and should be
|
|
|
|
* removed.
|
|
|
|
*
|
2014-05-19 05:39:07 -06:00
|
|
|
* Return: A handle to the allocated memory block on success or NULL on
|
|
|
|
* failure.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2010-01-04 20:25:05 -07:00
|
|
|
drm_dma_handle_t *drm_pci_alloc(struct drm_device * dev, size_t size, size_t align)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2005-07-09 23:38:56 -06:00
|
|
|
drm_dma_handle_t *dmah;
|
2006-03-19 00:56:12 -07:00
|
|
|
unsigned long addr;
|
|
|
|
size_t sz;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* pci_alloc_consistent only guarantees alignment to the smallest
|
|
|
|
* PAGE_SIZE order which is greater than or equal to the requested size.
|
|
|
|
* Return NULL here for now to make sure nobody tries for larger alignment
|
|
|
|
*/
|
|
|
|
if (align > size)
|
|
|
|
return NULL;
|
|
|
|
|
2005-07-09 23:38:56 -06:00
|
|
|
dmah = kmalloc(sizeof(drm_dma_handle_t), GFP_KERNEL);
|
|
|
|
if (!dmah)
|
|
|
|
return NULL;
|
2005-09-24 22:28:13 -06:00
|
|
|
|
2005-07-09 23:38:56 -06:00
|
|
|
dmah->size = size;
|
2006-03-19 00:56:12 -07:00
|
|
|
dmah->vaddr = dma_alloc_coherent(&dev->pdev->dev, size, &dmah->busaddr, GFP_KERNEL | __GFP_COMP);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-07-09 23:38:56 -06:00
|
|
|
if (dmah->vaddr == NULL) {
|
|
|
|
kfree(dmah);
|
2005-04-16 16:20:36 -06:00
|
|
|
return NULL;
|
2005-07-09 23:38:56 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-07-09 23:38:56 -06:00
|
|
|
memset(dmah->vaddr, 0, size);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2006-03-19 00:56:12 -07:00
|
|
|
/* XXX - Is virt_to_page() legal for consistent mem? */
|
|
|
|
/* Reserve */
|
|
|
|
for (addr = (unsigned long)dmah->vaddr, sz = size;
|
|
|
|
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
2013-10-27 15:52:39 -06:00
|
|
|
SetPageReserved(virt_to_page((void *)addr));
|
2006-03-19 00:56:12 -07:00
|
|
|
}
|
|
|
|
|
2005-07-09 23:38:56 -06:00
|
|
|
return dmah;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2005-09-24 22:28:13 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
EXPORT_SYMBOL(drm_pci_alloc);
|
|
|
|
|
2014-05-19 05:39:07 -06:00
|
|
|
/*
|
|
|
|
* Free a PCI consistent memory block without freeing its descriptor.
|
2005-07-09 23:38:56 -06:00
|
|
|
*
|
|
|
|
* This function is for internal use in the Linux-specific DRM core code.
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
2014-09-10 04:43:51 -06:00
|
|
|
void __drm_legacy_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2006-03-19 00:56:12 -07:00
|
|
|
unsigned long addr;
|
|
|
|
size_t sz;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2009-03-24 13:23:04 -06:00
|
|
|
if (dmah->vaddr) {
|
2006-03-19 00:56:12 -07:00
|
|
|
/* XXX - Is virt_to_page() legal for consistent mem? */
|
|
|
|
/* Unreserve */
|
|
|
|
for (addr = (unsigned long)dmah->vaddr, sz = dmah->size;
|
|
|
|
sz > 0; addr += PAGE_SIZE, sz -= PAGE_SIZE) {
|
2013-10-27 15:52:39 -06:00
|
|
|
ClearPageReserved(virt_to_page((void *)addr));
|
2006-03-19 00:56:12 -07:00
|
|
|
}
|
|
|
|
dma_free_coherent(&dev->pdev->dev, dmah->size, dmah->vaddr,
|
|
|
|
dmah->busaddr);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
2005-07-09 23:38:56 -06:00
|
|
|
|
|
|
|
/**
|
2014-05-19 05:39:07 -06:00
|
|
|
* drm_pci_free - Free a PCI consistent memory block
|
|
|
|
* @dev: DRM device
|
|
|
|
* @dmah: handle to memory block
|
2017-03-08 07:12:37 -07:00
|
|
|
*
|
|
|
|
* FIXME: This is a needless abstraction of the Linux dma-api and should be
|
|
|
|
* removed.
|
2005-07-09 23:38:56 -06:00
|
|
|
*/
|
2007-07-10 23:53:27 -06:00
|
|
|
void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
|
2005-07-09 23:38:56 -06:00
|
|
|
{
|
2014-09-10 04:43:51 -06:00
|
|
|
__drm_legacy_pci_free(dev, dmah);
|
2005-07-09 23:38:56 -06:00
|
|
|
kfree(dmah);
|
|
|
|
}
|
2005-09-24 22:28:13 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
EXPORT_SYMBOL(drm_pci_free);
|
|
|
|
|
2010-05-27 13:40:25 -06:00
|
|
|
#ifdef CONFIG_PCI
|
2010-12-14 10:16:38 -07:00
|
|
|
|
|
|
|
static int drm_get_pci_domain(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
#ifndef __alpha__
|
|
|
|
/* For historical reasons, drm_get_pci_domain() is busticated
|
|
|
|
* on most archs and has to remain so for userspace interface
|
|
|
|
* < 1.4, except on alpha which was right from the beginning
|
|
|
|
*/
|
|
|
|
if (dev->if_version < 0x10004)
|
|
|
|
return 0;
|
|
|
|
#endif /* __alpha__ */
|
|
|
|
|
|
|
|
return pci_domain_nr(dev->pdev->bus);
|
|
|
|
}
|
|
|
|
|
2014-08-29 04:12:43 -06:00
|
|
|
int drm_pci_set_busid(struct drm_device *dev, struct drm_master *master)
|
2010-12-14 10:16:38 -07:00
|
|
|
{
|
2014-08-29 04:12:41 -06:00
|
|
|
master->unique = kasprintf(GFP_KERNEL, "pci:%04x:%02x:%02x.%d",
|
|
|
|
drm_get_pci_domain(dev),
|
|
|
|
dev->pdev->bus->number,
|
|
|
|
PCI_SLOT(dev->pdev->devfn),
|
|
|
|
PCI_FUNC(dev->pdev->devfn));
|
|
|
|
if (!master->unique)
|
2010-12-14 10:16:38 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-08-29 04:12:41 -06:00
|
|
|
master->unique_len = strlen(master->unique);
|
2010-12-14 10:16:38 -07:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-06-15 03:26:47 -06:00
|
|
|
static int drm_pci_irq_by_busid(struct drm_device *dev, struct drm_irq_busid *p)
|
2010-12-14 10:16:38 -07:00
|
|
|
{
|
|
|
|
if ((p->busnum >> 8) != drm_get_pci_domain(dev) ||
|
|
|
|
(p->busnum & 0xff) != dev->pdev->bus->number ||
|
|
|
|
p->devnum != PCI_SLOT(dev->pdev->devfn) || p->funcnum != PCI_FUNC(dev->pdev->devfn))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
p->irq = dev->pdev->irq;
|
|
|
|
|
|
|
|
DRM_DEBUG("%d:%d:%d => IRQ %d\n", p->busnum, p->devnum, p->funcnum,
|
|
|
|
p->irq);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-08-28 07:19:23 -06:00
|
|
|
/**
|
2014-05-19 05:39:07 -06:00
|
|
|
* drm_irq_by_busid - Get interrupt from bus ID
|
|
|
|
* @dev: DRM device
|
|
|
|
* @data: IOCTL parameter pointing to a drm_irq_busid structure
|
|
|
|
* @file_priv: DRM file private.
|
2013-08-28 07:19:23 -06:00
|
|
|
*
|
|
|
|
* Finds the PCI device with the specified bus id and gets its IRQ number.
|
|
|
|
* This IOCTL is deprecated, and will now return EINVAL for any busid not equal
|
|
|
|
* to that of the device that this DRM instance attached to.
|
2014-05-19 05:39:07 -06:00
|
|
|
*
|
|
|
|
* Return: 0 on success or a negative error code on failure.
|
2013-08-28 07:19:23 -06:00
|
|
|
*/
|
|
|
|
int drm_irq_by_busid(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_irq_busid *p = data;
|
|
|
|
|
2016-08-03 13:11:10 -06:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_LEGACY))
|
2013-08-28 07:19:23 -06:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/* UMS was only ever support on PCI devices. */
|
|
|
|
if (WARN_ON(!dev->pdev))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return drm_pci_irq_by_busid(dev, p);
|
|
|
|
}
|
|
|
|
|
2013-12-11 03:34:34 -07:00
|
|
|
static void drm_pci_agp_init(struct drm_device *dev)
|
2010-12-14 10:16:38 -07:00
|
|
|
{
|
2013-12-11 03:34:35 -07:00
|
|
|
if (drm_core_check_feature(dev, DRIVER_USE_AGP)) {
|
2017-01-24 23:26:52 -07:00
|
|
|
if (pci_find_capability(dev->pdev, PCI_CAP_ID_AGP))
|
2010-12-14 10:16:38 -07:00
|
|
|
dev->agp = drm_agp_init(dev);
|
drm: rip out drm_core_has_MTRR checks
The new arch_phys_wc_add/del functions do the right thing both with
and without MTRR support in the kernel. So we can drop these
additional checks.
David Herrmann suggest to also kill the DRIVER_USE_MTRR flag since
it's now unused, which spurred me to do a bit a better audit of the
affected drivers. David helped a lot in that. Quoting our mail
discussion:
On Wed, Jul 10, 2013 at 5:41 PM, David Herrmann <dh.herrmann@gmail.com> wrote:
> On Wed, Jul 10, 2013 at 5:22 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> On Wed, Jul 10, 2013 at 3:51 PM, David Herrmann <dh.herrmann@gmail.com> wrote:
>>>> -#if __OS_HAS_MTRR
>>>> -static inline int drm_core_has_MTRR(struct drm_device *dev)
>>>> -{
>>>> - return drm_core_check_feature(dev, DRIVER_USE_MTRR);
>>>> -}
>>>> -#else
>>>> -#define drm_core_has_MTRR(dev) (0)
>>>> -#endif
>>>> -
>>>
>>> That was the last user of DRIVER_USE_MTRR (apart from drivers setting
>>> it in .driver_features). Any reason to keep it around?
>>
>> Yeah, I guess we could rip things out. Which will also force me to
>> properly audit drivers for the eventual behaviour change this could
>> entail (in case there's an x86 driver which did not ask for an mtrr,
>> but iirc there isn't).
>
> david@david-mb ~/dev/kernel/linux $ for i in drivers/gpu/drm/* ; do if
> test -d "$i" ; then if ! grep -q USE_MTRR -r $i ; then echo $i ; fi ;
> fi ; done
> drivers/gpu/drm/exynos
> drivers/gpu/drm/gma500
> drivers/gpu/drm/i2c
> drivers/gpu/drm/nouveau
> drivers/gpu/drm/omapdrm
> drivers/gpu/drm/qxl
> drivers/gpu/drm/rcar-du
> drivers/gpu/drm/shmobile
> drivers/gpu/drm/tilcdc
> drivers/gpu/drm/ttm
> drivers/gpu/drm/udl
> drivers/gpu/drm/vmwgfx
> david@david-mb ~/dev/kernel/linux $
>
> So for x86 gma500,nouveau,qxl,udl,vmwgfx don't set DRIVER_USE_MTRR.
> But I cannot tell whether they break if we call arch_phys_wc_add/del,
> anyway. At least nouveau seemed to work here, but it doesn't use AGP
> or drm_bufs, I guess.
Cool, thanks a lot for stitching together the list of drivers to look
at. So for real KMS drivers it's the drives responsibility to add an
mtrr if it needs one. nouvea, radeon, mgag200, i915 and vmwgfx do that
already. Somehow the savage driver also ends up doing that, I have no
idea why.
Note that gma500 as a pure KMS driver doesn't need MTRR setup since
the platforms that it supports all support PAT. So no MTRRs needed to
get wc iomappings.
The mtrr support in the drm core is all for legacy mappings of garts,
framebuffers and registers. All legacy drivers set the USE_MTRR flag,
so we're good there.
All in all I think we can really just ditch this
/endquote
v2: Also kill DRIVER_USE_MTRR as suggested by David Herrmann
v3: Rebase on top of David Herrmann's agp setup/cleanup changes.
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-08-08 07:41:27 -06:00
|
|
|
if (dev->agp) {
|
|
|
|
dev->agp->agp_mtrr = arch_phys_wc_add(
|
|
|
|
dev->agp->agp_info.aper_base,
|
|
|
|
dev->agp->agp_info.aper_size *
|
|
|
|
1024 * 1024);
|
2010-12-14 10:16:38 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-11 03:34:38 -07:00
|
|
|
void drm_pci_agp_destroy(struct drm_device *dev)
|
2013-07-27 08:37:00 -06:00
|
|
|
{
|
2013-12-11 03:34:35 -07:00
|
|
|
if (dev->agp) {
|
drm: rip out drm_core_has_MTRR checks
The new arch_phys_wc_add/del functions do the right thing both with
and without MTRR support in the kernel. So we can drop these
additional checks.
David Herrmann suggest to also kill the DRIVER_USE_MTRR flag since
it's now unused, which spurred me to do a bit a better audit of the
affected drivers. David helped a lot in that. Quoting our mail
discussion:
On Wed, Jul 10, 2013 at 5:41 PM, David Herrmann <dh.herrmann@gmail.com> wrote:
> On Wed, Jul 10, 2013 at 5:22 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
>> On Wed, Jul 10, 2013 at 3:51 PM, David Herrmann <dh.herrmann@gmail.com> wrote:
>>>> -#if __OS_HAS_MTRR
>>>> -static inline int drm_core_has_MTRR(struct drm_device *dev)
>>>> -{
>>>> - return drm_core_check_feature(dev, DRIVER_USE_MTRR);
>>>> -}
>>>> -#else
>>>> -#define drm_core_has_MTRR(dev) (0)
>>>> -#endif
>>>> -
>>>
>>> That was the last user of DRIVER_USE_MTRR (apart from drivers setting
>>> it in .driver_features). Any reason to keep it around?
>>
>> Yeah, I guess we could rip things out. Which will also force me to
>> properly audit drivers for the eventual behaviour change this could
>> entail (in case there's an x86 driver which did not ask for an mtrr,
>> but iirc there isn't).
>
> david@david-mb ~/dev/kernel/linux $ for i in drivers/gpu/drm/* ; do if
> test -d "$i" ; then if ! grep -q USE_MTRR -r $i ; then echo $i ; fi ;
> fi ; done
> drivers/gpu/drm/exynos
> drivers/gpu/drm/gma500
> drivers/gpu/drm/i2c
> drivers/gpu/drm/nouveau
> drivers/gpu/drm/omapdrm
> drivers/gpu/drm/qxl
> drivers/gpu/drm/rcar-du
> drivers/gpu/drm/shmobile
> drivers/gpu/drm/tilcdc
> drivers/gpu/drm/ttm
> drivers/gpu/drm/udl
> drivers/gpu/drm/vmwgfx
> david@david-mb ~/dev/kernel/linux $
>
> So for x86 gma500,nouveau,qxl,udl,vmwgfx don't set DRIVER_USE_MTRR.
> But I cannot tell whether they break if we call arch_phys_wc_add/del,
> anyway. At least nouveau seemed to work here, but it doesn't use AGP
> or drm_bufs, I guess.
Cool, thanks a lot for stitching together the list of drivers to look
at. So for real KMS drivers it's the drives responsibility to add an
mtrr if it needs one. nouvea, radeon, mgag200, i915 and vmwgfx do that
already. Somehow the savage driver also ends up doing that, I have no
idea why.
Note that gma500 as a pure KMS driver doesn't need MTRR setup since
the platforms that it supports all support PAT. So no MTRRs needed to
get wc iomappings.
The mtrr support in the drm core is all for legacy mappings of garts,
framebuffers and registers. All legacy drivers set the USE_MTRR flag,
so we're good there.
All in all I think we can really just ditch this
/endquote
v2: Also kill DRIVER_USE_MTRR as suggested by David Herrmann
v3: Rebase on top of David Herrmann's agp setup/cleanup changes.
Cc: David Herrmann <dh.herrmann@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-08-08 07:41:27 -06:00
|
|
|
arch_phys_wc_del(dev->agp->agp_mtrr);
|
2016-04-26 11:29:34 -06:00
|
|
|
drm_legacy_agp_clear(dev);
|
2013-12-11 03:34:37 -07:00
|
|
|
kfree(dev->agp);
|
2013-07-27 08:37:00 -06:00
|
|
|
dev->agp = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-05-27 13:40:25 -06:00
|
|
|
/**
|
2014-05-19 05:39:07 -06:00
|
|
|
* drm_get_pci_dev - Register a PCI device with the DRM subsystem
|
|
|
|
* @pdev: PCI device
|
|
|
|
* @ent: entry from the PCI ID table that matches @pdev
|
|
|
|
* @driver: DRM device driver
|
2010-05-27 13:40:25 -06:00
|
|
|
*
|
|
|
|
* Attempt to gets inter module "drm" information. If we are first
|
|
|
|
* then register the character device and inter module information.
|
|
|
|
* Try and register, if we fail to register, backout previous work.
|
2014-05-19 05:39:07 -06:00
|
|
|
*
|
2015-09-28 13:46:35 -06:00
|
|
|
* NOTE: This function is deprecated, please use drm_dev_alloc() and
|
2017-01-24 23:26:47 -07:00
|
|
|
* drm_dev_register() instead and remove your &drm_driver.load callback.
|
2015-09-28 13:46:35 -06:00
|
|
|
*
|
2014-05-19 05:39:07 -06:00
|
|
|
* Return: 0 on success or a negative error code on failure.
|
2010-05-27 13:40:25 -06:00
|
|
|
*/
|
|
|
|
int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
|
|
|
|
struct drm_driver *driver)
|
|
|
|
{
|
|
|
|
struct drm_device *dev;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
DRM_DEBUG("\n");
|
|
|
|
|
2013-10-02 03:23:34 -06:00
|
|
|
dev = drm_dev_alloc(driver, &pdev->dev);
|
2016-09-21 08:59:19 -06:00
|
|
|
if (IS_ERR(dev))
|
|
|
|
return PTR_ERR(dev);
|
2010-05-27 13:40:25 -06:00
|
|
|
|
|
|
|
ret = pci_enable_device(pdev);
|
|
|
|
if (ret)
|
2013-10-02 03:23:35 -06:00
|
|
|
goto err_free;
|
2010-05-27 13:40:25 -06:00
|
|
|
|
|
|
|
dev->pdev = pdev;
|
|
|
|
#ifdef __alpha__
|
|
|
|
dev->hose = pdev->sysdata;
|
|
|
|
#endif
|
|
|
|
|
2013-10-02 03:23:35 -06:00
|
|
|
if (drm_core_check_feature(dev, DRIVER_MODESET))
|
2010-05-27 13:40:25 -06:00
|
|
|
pci_set_drvdata(pdev, dev);
|
drm: implement experimental render nodes
Render nodes provide an API for userspace to use non-privileged GPU
commands without any running DRM-Master. It is useful for offscreen
rendering, GPGPU clients, and normal render clients which do not perform
modesetting.
Compared to legacy clients, render clients no longer need any
authentication to perform client ioctls. Instead, user-space controls
render/client access to GPUs via filesystem access-modes on the
render-node. Once a render-node was opened, a client has full access to
the client/render operations on the GPU. However, no modesetting or ioctls
that affect global state are allowed on render nodes.
To prevent privilege-escalation, drivers must explicitly state that they
support render nodes. They must mark their render-only ioctls as
DRM_RENDER_ALLOW so render clients can use them. Furthermore, they must
support clients without any attached master.
If filesystem access-modes are not enough for fine-grained access control
to render nodes (very unlikely, considering the versaitlity of FS-ACLs),
you may still fall-back to fd-passing from server to client (which allows
arbitrary access-control). However, note that revoking access is
currently impossible and unlikely to get implemented.
Note: Render clients no longer have any associated DRM-Master as they are
supposed to be independent of any server state. DRM core highly depends on
file_priv->master to be non-NULL for modesetting/ctx/etc. commands.
Therefore, drivers must be very careful to not require DRM-Master if they
support DRIVER_RENDER.
So far render-nodes are protected by "drm_rnodes". As long as this
module-parameter is not set to 1, a driver will not create render nodes.
This allows us to experiment with the API a bit before we stabilize it.
v2: drop insecure GEM_FLINK to force use of dmabuf
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2013-08-25 10:29:00 -06:00
|
|
|
|
2013-12-11 03:34:36 -07:00
|
|
|
drm_pci_agp_init(dev);
|
|
|
|
|
2013-10-02 03:23:35 -06:00
|
|
|
ret = drm_dev_register(dev, ent->driver_data);
|
|
|
|
if (ret)
|
2013-12-11 03:34:36 -07:00
|
|
|
goto err_agp;
|
2010-05-27 13:40:25 -06:00
|
|
|
|
2013-12-11 03:34:31 -07:00
|
|
|
/* No locking needed since shadow-attach is single-threaded since it may
|
|
|
|
* only be called from the per-driver module init hook. */
|
2016-08-03 13:11:10 -06:00
|
|
|
if (drm_core_check_feature(dev, DRIVER_LEGACY))
|
2013-12-11 03:34:31 -07:00
|
|
|
list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
|
|
|
|
|
2010-05-27 13:40:25 -06:00
|
|
|
return 0;
|
|
|
|
|
2013-12-11 03:34:36 -07:00
|
|
|
err_agp:
|
|
|
|
drm_pci_agp_destroy(dev);
|
2010-05-27 13:40:25 -06:00
|
|
|
pci_disable_device(pdev);
|
2013-10-02 03:23:35 -06:00
|
|
|
err_free:
|
2017-09-26 11:04:00 -06:00
|
|
|
drm_dev_put(dev);
|
2010-05-27 13:40:25 -06:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_get_pci_dev);
|
|
|
|
|
|
|
|
/**
|
2017-05-24 08:51:40 -06:00
|
|
|
* drm_legacy_pci_init - shadow-attach a legacy DRM PCI driver
|
2014-05-19 05:39:07 -06:00
|
|
|
* @driver: DRM device driver
|
|
|
|
* @pdriver: PCI device driver
|
2010-05-27 13:40:25 -06:00
|
|
|
*
|
2017-05-24 08:51:40 -06:00
|
|
|
* This is only used by legacy dri1 drivers and deprecated.
|
2015-09-28 13:46:35 -06:00
|
|
|
*
|
2014-05-19 05:39:07 -06:00
|
|
|
* Return: 0 on success or a negative error code on failure.
|
2010-05-27 13:40:25 -06:00
|
|
|
*/
|
2017-05-24 08:51:40 -06:00
|
|
|
int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
|
2010-05-27 13:40:25 -06:00
|
|
|
{
|
|
|
|
struct pci_dev *pdev = NULL;
|
|
|
|
const struct pci_device_id *pid;
|
|
|
|
int i;
|
|
|
|
|
2010-12-14 10:16:38 -07:00
|
|
|
DRM_DEBUG("\n");
|
|
|
|
|
2017-05-24 08:51:40 -06:00
|
|
|
if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY)))
|
|
|
|
return -EINVAL;
|
2010-05-27 13:40:25 -06:00
|
|
|
|
|
|
|
/* If not using KMS, fall back to stealth mode manual scanning. */
|
2013-12-11 03:34:31 -07:00
|
|
|
INIT_LIST_HEAD(&driver->legacy_dev_list);
|
2010-12-14 10:16:38 -07:00
|
|
|
for (i = 0; pdriver->id_table[i].vendor != 0; i++) {
|
|
|
|
pid = &pdriver->id_table[i];
|
2010-05-27 13:40:25 -06:00
|
|
|
|
|
|
|
/* Loop around setting up a DRM device for each PCI device
|
|
|
|
* matching our ID and device class. If we had the internal
|
|
|
|
* function that pci_get_subsys and pci_get_class used, we'd
|
|
|
|
* be able to just pass pid in instead of doing a two-stage
|
|
|
|
* thing.
|
|
|
|
*/
|
|
|
|
pdev = NULL;
|
|
|
|
while ((pdev =
|
|
|
|
pci_get_subsys(pid->vendor, pid->device, pid->subvendor,
|
|
|
|
pid->subdevice, pdev)) != NULL) {
|
|
|
|
if ((pdev->class & pid->class_mask) != pid->class)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* stealth mode requires a manual probe */
|
|
|
|
pci_dev_get(pdev);
|
|
|
|
drm_get_pci_dev(pdev, pid, driver);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2017-05-24 08:51:40 -06:00
|
|
|
EXPORT_SYMBOL(drm_legacy_pci_init);
|
2010-05-27 13:40:25 -06:00
|
|
|
|
2012-06-27 01:35:53 -06:00
|
|
|
int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
|
|
|
|
{
|
|
|
|
struct pci_dev *root;
|
2013-01-04 12:10:42 -07:00
|
|
|
u32 lnkcap, lnkcap2;
|
2012-06-27 01:35:53 -06:00
|
|
|
|
|
|
|
*mask = 0;
|
|
|
|
if (!dev->pdev)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
root = dev->pdev->bus->self;
|
|
|
|
|
|
|
|
/* we've been informed via and serverworks don't make the cut */
|
|
|
|
if (root->vendor == PCI_VENDOR_ID_VIA ||
|
|
|
|
root->vendor == PCI_VENDOR_ID_SERVERWORKS)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-01-04 12:10:42 -07:00
|
|
|
pcie_capability_read_dword(root, PCI_EXP_LNKCAP, &lnkcap);
|
|
|
|
pcie_capability_read_dword(root, PCI_EXP_LNKCAP2, &lnkcap2);
|
2012-06-27 01:35:53 -06:00
|
|
|
|
2013-01-04 12:10:42 -07:00
|
|
|
if (lnkcap2) { /* PCIe r3.0-compliant */
|
2012-06-27 01:35:53 -06:00
|
|
|
if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_2_5GB)
|
|
|
|
*mask |= DRM_PCIE_SPEED_25;
|
|
|
|
if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_5_0GB)
|
|
|
|
*mask |= DRM_PCIE_SPEED_50;
|
|
|
|
if (lnkcap2 & PCI_EXP_LNKCAP2_SLS_8_0GB)
|
|
|
|
*mask |= DRM_PCIE_SPEED_80;
|
2013-01-04 12:10:42 -07:00
|
|
|
} else { /* pre-r3.0 */
|
2013-01-04 12:10:32 -07:00
|
|
|
if (lnkcap & PCI_EXP_LNKCAP_SLS_2_5GB)
|
2012-06-27 01:35:53 -06:00
|
|
|
*mask |= DRM_PCIE_SPEED_25;
|
2013-01-04 12:10:32 -07:00
|
|
|
if (lnkcap & PCI_EXP_LNKCAP_SLS_5_0GB)
|
2013-01-04 12:10:37 -07:00
|
|
|
*mask |= (DRM_PCIE_SPEED_25 | DRM_PCIE_SPEED_50);
|
2012-06-27 01:35:53 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
DRM_INFO("probing gen 2 caps for device %x:%x = %x/%x\n", root->vendor, root->device, lnkcap, lnkcap2);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask);
|
2013-02-08 15:27:01 -07:00
|
|
|
|
2015-11-11 21:14:39 -07:00
|
|
|
int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw)
|
|
|
|
{
|
|
|
|
struct pci_dev *root;
|
|
|
|
u32 lnkcap;
|
|
|
|
|
|
|
|
*mlw = 0;
|
|
|
|
if (!dev->pdev)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
root = dev->pdev->bus->self;
|
|
|
|
|
|
|
|
pcie_capability_read_dword(root, PCI_EXP_LNKCAP, &lnkcap);
|
|
|
|
|
|
|
|
*mlw = (lnkcap & PCI_EXP_LNKCAP_MLW) >> 4;
|
|
|
|
|
|
|
|
DRM_INFO("probing mlw for device %x:%x = %x\n", root->vendor, root->device, lnkcap);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_pcie_get_max_link_width);
|
|
|
|
|
2013-02-08 15:27:01 -07:00
|
|
|
#else
|
|
|
|
|
2013-12-11 03:34:38 -07:00
|
|
|
void drm_pci_agp_destroy(struct drm_device *dev) {}
|
2013-08-28 07:19:23 -06:00
|
|
|
|
|
|
|
int drm_irq_by_busid(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2013-02-08 15:27:01 -07:00
|
|
|
#endif
|
|
|
|
|
2014-05-19 05:39:07 -06:00
|
|
|
/**
|
2017-05-24 08:51:40 -06:00
|
|
|
* drm_legacy_pci_exit - unregister shadow-attach legacy DRM driver
|
2014-05-19 05:39:07 -06:00
|
|
|
* @driver: DRM device driver
|
|
|
|
* @pdriver: PCI device driver
|
|
|
|
*
|
2017-05-24 08:51:40 -06:00
|
|
|
* Unregister a DRM driver shadow-attached through drm_legacy_pci_init(). This
|
|
|
|
* is deprecated and only used by dri1 drivers.
|
2014-05-19 05:39:07 -06:00
|
|
|
*/
|
2017-05-24 08:51:40 -06:00
|
|
|
void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
|
2013-02-08 15:27:01 -07:00
|
|
|
{
|
|
|
|
struct drm_device *dev, *tmp;
|
|
|
|
DRM_DEBUG("\n");
|
|
|
|
|
2016-08-03 13:11:10 -06:00
|
|
|
if (!(driver->driver_features & DRIVER_LEGACY)) {
|
2017-05-24 08:51:40 -06:00
|
|
|
WARN_ON(1);
|
2013-02-08 15:27:01 -07:00
|
|
|
} else {
|
2013-12-11 03:34:31 -07:00
|
|
|
list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
|
|
|
|
legacy_dev_list) {
|
|
|
|
list_del(&dev->legacy_dev_list);
|
2014-01-30 09:58:38 -07:00
|
|
|
drm_put_dev(dev);
|
2013-12-11 03:34:31 -07:00
|
|
|
}
|
2013-02-08 15:27:01 -07:00
|
|
|
}
|
|
|
|
DRM_INFO("Module unloaded\n");
|
|
|
|
}
|
2017-05-24 08:51:40 -06:00
|
|
|
EXPORT_SYMBOL(drm_legacy_pci_exit);
|