drm/nouveau: silence some compiler warnings

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_channel.c b/drivers/gpu/drm/nouveau/nouveau_channel.c
index 3960d66d7abab27504cac39ab85e6698a4dcf0ea..3d7b316c3bbdb7678754ea35e63decd563da0e36 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_channel.c
+++ b/drivers/gpu/drm/nouveau/nouveau_channel.c
@@ -35,7 +35,7 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_bo *pb = chan->pushbuf_bo;
        struct nouveau_gpuobj *pushbuf = NULL;
-       int ret;
+       int ret = 0;
 
        if (dev_priv->card_type >= NV_50) {
                if (dev_priv->card_type < NV_C0) {

diff --git a/drivers/gpu/drm/nouveau/nouveau_dp.c b/drivers/gpu/drm/nouveau/nouveau_dp.c
index 38d599554bce74c5409d3cddaf5e6fe7427cbeff..7beb82a0315d73ec5aae3a4848e0d92e4d4d36e6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_dp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_dp.c
@@ -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 drm_device *dev = encoder->dev;
-       struct bit_displayport_encoder_table_entry *dpse;
        struct bit_displayport_encoder_table *dpe;
        int ret, i, dpe_headerlen, vs = 0, pre = 0;
        uint8_t request[2];
@@ -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);
        if (!dpe)
                return false;
-       dpse = (void *)((char *)dpe + dpe_headerlen);
 
        ret = auxch_rd(encoder, DP_ADJUST_REQUEST_LANE0_1, request, 2);
        if (ret)

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 7cc94ed9ed9570906a114ac6fb852006dba3a7a3..5096f2f45df840fd220428a584f945d73e2a0ea8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -587,7 +587,7 @@ static void
 nv50_display_unk20_handler(struct drm_device *dev)
 {
        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;
        int i, crtc, or, type = OUTPUT_ANY;
 

diff --git a/drivers/gpu/drm/nouveau/nv50_gpio.c b/drivers/gpu/drm/nouveau/nv50_gpio.c
index 6b149c0cc06d38435deb267afc5eac5e7248a2de..1710c080272f1abc843e36c77bcbcabddec758df 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_gpio.c
+++ b/drivers/gpu/drm/nouveau/nv50_gpio.c
@@ -205,7 +205,6 @@ nv50_gpio_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;
-       struct nv50_gpio_priv *priv;
        int ret;
 
        if (!pgpio->priv) {
@@ -213,7 +212,6 @@ nv50_gpio_init(struct drm_device *dev)
                if (ret)
                        return ret;
        }
-       priv = pgpio->priv;
 
        /* disable, and ack any pending gpio interrupts */
        nv_wr32(dev, 0xe050, 0x00000000);

diff --git a/drivers/gpu/drm/nouveau/nv50_vm.c b/drivers/gpu/drm/nouveau/nv50_vm.c
index 459ff08241e571400eb63e9e84c2cdae9a150bb7..03c1a63b24f43e469a82a86dde694fab425fb4c4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nv50_vm.c
+++ b/drivers/gpu/drm/nouveau/nv50_vm.c
@@ -31,7 +31,6 @@ void
 nv50_vm_map_pgt(struct nouveau_gpuobj *pgd, u32 pde,
                struct nouveau_gpuobj *pgt[2])
 {
-       struct drm_nouveau_private *dev_priv = pgd->dev->dev_private;
        u64 phys = 0xdeadcafe00000000ULL;
        u32 coverage = 0;
 

diff --git a/drivers/gpu/drm/nouveau/nvc0_graph.c b/drivers/gpu/drm/nouveau/nvc0_graph.c
index eb18a7e89f5b51b567964fa5a72f1f10f9324412..afa7afe4ef9234dfd2cc212f5a1127392c10b8c6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvc0_graph.c
+++ b/drivers/gpu/drm/nouveau/nvc0_graph.c
@@ -640,7 +640,6 @@ nvc0_graph_init(struct drm_device *dev)
 {
        struct drm_nouveau_private *dev_priv = dev->dev_private;
        struct nouveau_pgraph_engine *pgraph = &dev_priv->engine.graph;
-       struct nvc0_graph_priv *priv;
        int ret;
 
        dev_priv->engine.graph.accel_blocked = true;
@@ -665,7 +664,6 @@ nvc0_graph_init(struct drm_device *dev)
                if (ret)
                        return ret;
        }
-       priv = pgraph->priv;
 
        nvc0_graph_init_obj418880(dev);
        nvc0_graph_init_regs(dev);