fdo-mirrors/mesa-drm
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/drm.git synced 2026-04-30 08:50:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nouveau: use nouveau_fence_channel() to get chan for m2mf move

Browse source
This commit is contained in:
Ben Skeggs 2009-03-18 19:26:51 +10:00
parent ec5abde7b3
commit 7e0ed73e0c
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
linux-core/nouveau_bo.c
View file

@ -161,9 +161,10 @@ nouveau_bo_move_m2mf(struct drm_buffer_object *bo, int evict, int no_wait,
{
struct drm_device *dev = bo->dev;
struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_channel *chan = dev_priv->fifos[bo->new_fence_class];
struct nouveau_channel *chan;
uint32_t page_count;
chan = nouveau_fence_channel(dev, bo->new_fence_class);
if (!chan) {
DRM_ERROR("channel %d non-existant, using kchan\n",
bo->fence_class);

2
linux-core/nouveau_fence.c
View file

@ -29,7 +29,7 @@
#include "nouveau_drv.h"
#include "nouveau_dma.h"
static struct nouveau_channel *
struct nouveau_channel *
nouveau_fence_channel(struct drm_device *dev, uint32_t class)
{
struct drm_nouveau_private *dev_priv = dev->dev_private;

2
shared-core/nouveau_drv.h
View file

@ -681,6 +681,8 @@ extern struct drm_bo_driver nouveau_bo_driver;
/* nouveau_fence.c */
extern struct drm_fence_driver nouveau_fence_driver;
extern void nouveau_fence_handler(struct drm_device *dev, int channel);
extern struct nouveau_channel *
nouveau_fence_channel(struct drm_device *, uint32_t fence_class);
/* nouveau_gem.c */
extern int nouveau_gem_object_new(struct drm_gem_object *);