mirror of
https://gitlab.freedesktop.org/mesa/drm.git
synced 2025-12-20 16:20:11 +01:00
e1460426b8
Add refcounting of user waiters to the DRM hardware lock, so that we can use the DRM_LOCK_CONT flag more conservatively. Also add a kernel waiter refcount that if nonzero transfers the lock for the kernel context, when it is released. This is useful when waiting for idle and can be used for very simple fence object driver implementations for the new memory manager. It also resolves the AIGLX startup deadlock for the sis and the via drivers. i810, i830 still require that the hardware lock is really taken so the deadlock remains for those two. I'm not sure about ffb. Anyone familiar with that code?
127 lines
3.4 KiB
C
127 lines
3.4 KiB
C
/* sis.c -- sis driver -*- linux-c -*-
|
|
*
|
|
* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
|
|
* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
|
|
* 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
|
|
* PRECISION INSIGHT AND/OR ITS SUPPLIERS 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 "drmP.h"
|
|
#include "sis_drm.h"
|
|
#include "sis_drv.h"
|
|
|
|
#include "drm_pciids.h"
|
|
|
|
static struct pci_device_id pciidlist[] = {
|
|
sis_PCI_IDS
|
|
};
|
|
|
|
|
|
static int sis_driver_load(drm_device_t *dev, unsigned long chipset)
|
|
{
|
|
drm_sis_private_t *dev_priv;
|
|
int ret;
|
|
|
|
dev_priv = drm_calloc(1, sizeof(drm_sis_private_t), DRM_MEM_DRIVER);
|
|
if (dev_priv == NULL)
|
|
return DRM_ERR(ENOMEM);
|
|
|
|
dev->dev_private = (void *)dev_priv;
|
|
dev_priv->chipset = chipset;
|
|
ret = drm_sman_init(&dev_priv->sman, 2, 12, 8);
|
|
if (ret) {
|
|
drm_free(dev_priv, sizeof(dev_priv), DRM_MEM_DRIVER);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int sis_driver_unload(drm_device_t *dev)
|
|
{
|
|
drm_sis_private_t *dev_priv = dev->dev_private;
|
|
|
|
drm_sman_takedown(&dev_priv->sman);
|
|
drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
static int probe(struct pci_dev *pdev, const struct pci_device_id *ent);
|
|
static struct drm_driver driver = {
|
|
.driver_features = DRIVER_USE_AGP | DRIVER_USE_MTRR,
|
|
.load = sis_driver_load,
|
|
.unload = sis_driver_unload,
|
|
.context_dtor = NULL,
|
|
.dma_quiescent = sis_idle,
|
|
.reclaim_buffers = NULL,
|
|
.reclaim_buffers_idlelocked = sis_reclaim_buffers_locked,
|
|
.lastclose = sis_lastclose,
|
|
.get_map_ofs = drm_core_get_map_ofs,
|
|
.get_reg_ofs = drm_core_get_reg_ofs,
|
|
.ioctls = sis_ioctls,
|
|
.fops = {
|
|
.owner = THIS_MODULE,
|
|
.open = drm_open,
|
|
.release = drm_release,
|
|
.ioctl = drm_ioctl,
|
|
.mmap = drm_mmap,
|
|
.poll = drm_poll,
|
|
.fasync = drm_fasync,
|
|
},
|
|
.pci_driver = {
|
|
.name = DRIVER_NAME,
|
|
.id_table = pciidlist,
|
|
.probe = probe,
|
|
.remove = __devexit_p(drm_cleanup_pci),
|
|
},
|
|
|
|
.name = DRIVER_NAME,
|
|
.desc = DRIVER_DESC,
|
|
.date = DRIVER_DATE,
|
|
.major = DRIVER_MAJOR,
|
|
.minor = DRIVER_MINOR,
|
|
.patchlevel = DRIVER_PATCHLEVEL,
|
|
};
|
|
|
|
static int probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
{
|
|
return drm_get_dev(pdev, ent, &driver);
|
|
}
|
|
|
|
static int __init sis_init(void)
|
|
{
|
|
driver.num_ioctls = sis_max_ioctl;
|
|
return drm_init(&driver, pciidlist);
|
|
}
|
|
|
|
static void __exit sis_exit(void)
|
|
{
|
|
drm_exit(&driver);
|
|
}
|
|
|
|
module_init(sis_init);
|
|
module_exit(sis_exit);
|
|
|
|
MODULE_AUTHOR(DRIVER_AUTHOR);
|
|
MODULE_DESCRIPTION(DRIVER_DESC);
|
|
MODULE_LICENSE("GPL and additional rights");
|