diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2010-06-07 15:38:27 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 10:13:37 +1000 |
| commit | b6d3d8717855c72e541bace5edd0460f2eed6dde (patch) | |
| tree | e631946df11e522caee84fa4c060db237ba26a30 /drivers/gpu/drm/nouveau/nouveau_bo.c | |
| parent | 646bef2d20accc6ed696a98e38d5f2515b0ff35d (diff) | |
| download | kernel_samsung_aries-b6d3d8717855c72e541bace5edd0460f2eed6dde.zip kernel_samsung_aries-b6d3d8717855c72e541bace5edd0460f2eed6dde.tar.gz kernel_samsung_aries-b6d3d8717855c72e541bace5edd0460f2eed6dde.tar.bz2 | |
drm/nouveau: remove dev_priv->init_state and friends
Nouveau will no longer load at all if card initialisation fails, so all
these checks are unnecessary.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_bo.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 1371c77..3ca8343 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -711,8 +711,7 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, bool intr, return ret; /* Software copy if the card isn't up and running yet. */ - if (dev_priv->init_state != NOUVEAU_CARD_INIT_DONE || - !dev_priv->channel) { + if (!dev_priv->channel) { ret = ttm_bo_move_memcpy(bo, evict, no_wait_reserve, no_wait_gpu, new_mem); goto out; } |