Commit 952eb635 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: remove some unused members from drm_nouveau_private

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 78ad0f7b
...@@ -142,7 +142,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, ...@@ -142,7 +142,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
GFP_KERNEL); GFP_KERNEL);
if (!dev_priv->fifos[channel]) if (!dev_priv->fifos[channel])
return -ENOMEM; return -ENOMEM;
dev_priv->fifo_alloc_count++;
chan = dev_priv->fifos[channel]; chan = dev_priv->fifos[channel];
INIT_LIST_HEAD(&chan->nvsw.vbl_wait); INIT_LIST_HEAD(&chan->nvsw.vbl_wait);
INIT_LIST_HEAD(&chan->fence.pending); INIT_LIST_HEAD(&chan->fence.pending);
...@@ -321,7 +320,6 @@ nouveau_channel_free(struct nouveau_channel *chan) ...@@ -321,7 +320,6 @@ nouveau_channel_free(struct nouveau_channel *chan)
iounmap(chan->user); iounmap(chan->user);
dev_priv->fifos[chan->id] = NULL; dev_priv->fifos[chan->id] = NULL;
dev_priv->fifo_alloc_count--;
kfree(chan); kfree(chan);
} }
......
...@@ -534,7 +534,6 @@ struct drm_nouveau_private { ...@@ -534,7 +534,6 @@ struct drm_nouveau_private {
struct fb_info *fbdev_info; struct fb_info *fbdev_info;
int fifo_alloc_count;
struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR]; struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
struct nouveau_engine engine; struct nouveau_engine engine;
...@@ -573,10 +572,6 @@ struct drm_nouveau_private { ...@@ -573,10 +572,6 @@ struct drm_nouveau_private {
struct nouveau_gpuobj *sg_ctxdma; struct nouveau_gpuobj *sg_ctxdma;
struct page *sg_dummy_page; struct page *sg_dummy_page;
dma_addr_t sg_dummy_bus; dma_addr_t sg_dummy_bus;
/* nottm hack */
struct drm_ttm_backend *sg_be;
unsigned long sg_handle;
} gart_info; } gart_info;
/* nv10-nv40 tiling regions */ /* nv10-nv40 tiling regions */
...@@ -615,11 +610,7 @@ struct drm_nouveau_private { ...@@ -615,11 +610,7 @@ struct drm_nouveau_private {
uint32_t dac_users[4]; uint32_t dac_users[4];
struct nouveau_suspend_resume { struct nouveau_suspend_resume {
uint32_t fifo_mode;
uint32_t graph_ctx_control;
uint32_t graph_state;
uint32_t *ramin_copy; uint32_t *ramin_copy;
uint64_t ramin_size;
} susres; } susres;
struct backlight_device *backlight; struct backlight_device *backlight;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment