Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea5f2786 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: silence some compiler warnings 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cb1d771a

drivers/gpu/drm/nouveau/nouveau_channel.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/nouveau/nouveau_dp.c

+0 −2
Original line number Diff line number Diff line
@@ -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)

drivers/gpu/drm/nouveau/nv50_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/nouveau/nv50_gpio.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/nouveau/nv50_vm.c

+0 −1
Original line number Diff line number Diff line
@@ -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;