Commit ea5f2786 authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau: silence some compiler warnings

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cb1d771a
...@@ -35,7 +35,7 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan) ...@@ -35,7 +35,7 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_bo *pb = chan->pushbuf_bo; struct nouveau_bo *pb = chan->pushbuf_bo;
struct nouveau_gpuobj *pushbuf = NULL; struct nouveau_gpuobj *pushbuf = NULL;
int ret; int ret = 0;
if (dev_priv->card_type >= NV_50) { if (dev_priv->card_type >= NV_50) {
if (dev_priv->card_type < NV_C0) { if (dev_priv->card_type < NV_C0) {
......
...@@ -175,7 +175,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config) ...@@ -175,7 +175,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
{ {
struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder); struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);
struct drm_device *dev = encoder->dev; struct drm_device *dev = encoder->dev;
struct bit_displayport_encoder_table_entry *dpse;
struct bit_displayport_encoder_table *dpe; struct bit_displayport_encoder_table *dpe;
int ret, i, dpe_headerlen, vs = 0, pre = 0; int ret, i, dpe_headerlen, vs = 0, pre = 0;
uint8_t request[2]; uint8_t request[2];
...@@ -183,7 +182,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config) ...@@ -183,7 +182,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen); dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
if (!dpe) if (!dpe)
return false; return false;
dpse = (void *)((char *)dpe + dpe_headerlen);
ret = auxch_rd(encoder, DP_ADJUST_REQUEST_LANE0_1, request, 2); ret = auxch_rd(encoder, DP_ADJUST_REQUEST_LANE0_1, request, 2);
if (ret) if (ret)
......
...@@ -587,7 +587,7 @@ static void ...@@ -587,7 +587,7 @@ static void
nv50_display_unk20_handler(struct drm_device *dev) nv50_display_unk20_handler(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
u32 unk30 = nv_rd32(dev, 0x610030), tmp, pclk, script, mc; u32 unk30 = nv_rd32(dev, 0x610030), tmp, pclk, script, mc = 0;
struct dcb_entry *dcb; struct dcb_entry *dcb;
int i, crtc, or, type = OUTPUT_ANY; int i, crtc, or, type = OUTPUT_ANY;
......
...@@ -205,7 +205,6 @@ nv50_gpio_init(struct drm_device *dev) ...@@ -205,7 +205,6 @@ nv50_gpio_init(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio; struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
struct nv50_gpio_priv *priv;
int ret; int ret;
if (!pgpio->priv) { if (!pgpio->priv) {
...@@ -213,7 +212,6 @@ nv50_gpio_init(struct drm_device *dev) ...@@ -213,7 +212,6 @@ nv50_gpio_init(struct drm_device *dev)
if (ret) if (ret)
return ret; return ret;
} }
priv = pgpio->priv;
/* disable, and ack any pending gpio interrupts */ /* disable, and ack any pending gpio interrupts */
nv_wr32(dev, 0xe050, 0x00000000); nv_wr32(dev, 0xe050, 0x00000000);
......
...@@ -31,7 +31,6 @@ void ...@@ -31,7 +31,6 @@ void
nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde, nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
struct nouveau_gpuobj *pgt[2]) struct nouveau_gpuobj *pgt[2])
{ {
struct drm_nouveau_private *dev_priv = pgd->dev->dev_private;
u64 phys = 0xdeadcafe00000000ULL; u64 phys = 0xdeadcafe00000000ULL;
u32 coverage = 0; u32 coverage = 0;
......
...@@ -640,7 +640,6 @@ nvc0_graph_init(struct drm_device *dev) ...@@ -640,7 +640,6 @@ nvc0_graph_init(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; struct drm_nouveau_private *dev_priv = dev->dev_private;
struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph; struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
struct nvc0_graph_priv *priv;
int ret; int ret;
dev_priv->engine.graph.accel_blocked = true; dev_priv->engine.graph.accel_blocked = true;
...@@ -665,7 +664,6 @@ nvc0_graph_init(struct drm_device *dev) ...@@ -665,7 +664,6 @@ nvc0_graph_init(struct drm_device *dev)
if (ret) if (ret)
return ret; return ret;
} }
priv = pgraph->priv;
nvc0_graph_init_obj418880(dev); nvc0_graph_init_obj418880(dev);
nvc0_graph_init_regs(dev); nvc0_graph_init_regs(dev);
......
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