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

Commit d22af68b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes (mostly nouveau) from Dave Airlie:
 "One doc buidling fixes for a file that moved, along with a bunch of
  nouveau fixes, one a build problem on ARM"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/doc: Refer to proper source file
  drm/nouveau/platform: fix compilation error
  drm/nouveau/gk20a: add LTC device
  drm/nouveau: warn if we fail to re-pin fb on resume
  drm/nouveau/nvif: fix dac load detect method definition
  drm/gf100-/gr: fix -ENOSPC detection when allocating zbc table entries
  drm/nouveau/nvif: return null pointers on failure, in addition to ret != 0
  drm/nouveau/ltc: fix tag base address getting truncated if above 4GiB
  drm/nvc0-/fb/ram: fix use of non-existant ram if partitions aren't uniform
  drm/nouveau/bar: behave better if ioremap failed
  drm/nouveau/kms: nouveau_fbcon_accel_fini can be static
  drm/nouveau: kill unused variable warning if !__OS_HAS_AGP
  drm/nouveau/nvif: fix a number of notify thinkos
parents 68ffeca4 25196484

Documentation/DocBook/drm.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ char *date;</synopsis> 
        <function>drm_dev_unregister()</function> followed by a call to

        <function>drm_dev_unref()</function>.

      </para>

!Edrivers/gpu/drm/drm_stub.c

!Edrivers/gpu/drm/drm_drv.c

    </sect2>

    <sect2>

      <title>Driver Load</title>

drivers/gpu/drm/nouveau/core/core/client.c

+2 −2
Original line number Diff line number Diff line
@@ -132,12 +132,12 @@ nvkm_client_notify_new(struct nouveau_client *client, 
		if (ret == 0) {

			client->notify[index] = notify;

			notify->client = client;

			return 0;

			return index;

		}

	}



	kfree(notify);

	return 0;

	return ret;

}



static int

drivers/gpu/drm/nouveau/core/engine/device/nve0.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ nve0_identify(struct nouveau_device *device) 
		device->oclass[NVDEV_SUBDEV_BUS    ] =  nvc0_bus_oclass;

		device->oclass[NVDEV_SUBDEV_TIMER  ] = &gk20a_timer_oclass;

		device->oclass[NVDEV_SUBDEV_FB     ] =  gk20a_fb_oclass;

		device->oclass[NVDEV_SUBDEV_LTC    ] =  gk104_ltc_oclass;

		device->oclass[NVDEV_SUBDEV_IBUS   ] = &gk20a_ibus_oclass;

		device->oclass[NVDEV_SUBDEV_INSTMEM] = nv50_instmem_oclass;

		device->oclass[NVDEV_SUBDEV_VM     ] = &nvc0_vmmgr_oclass;

drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ nvc0_graph_zbc_color_get(struct nvc0_graph_priv *priv, int format, 
		}

	}



	if (zbc < 0)

		return zbc;



	memcpy(priv->zbc_color[zbc].ds, ds, sizeof(priv->zbc_color[zbc].ds));

	memcpy(priv->zbc_color[zbc].l2, l2, sizeof(priv->zbc_color[zbc].l2));

	priv->zbc_color[zbc].format = format;
@@ -109,6 +112,9 @@ nvc0_graph_zbc_depth_get(struct nvc0_graph_priv *priv, int format, 
		}

	}



	if (zbc < 0)

		return zbc;



	priv->zbc_depth[zbc].format = format;

	priv->zbc_depth[zbc].ds = ds;

	priv->zbc_depth[zbc].l2 = l2;

drivers/gpu/drm/nouveau/core/include/core/client.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct nouveau_client { 
	void *data;



	int (*ntfy)(const void *, u32, const void *, u32);

	struct nvkm_client_notify *notify[8];

	struct nvkm_client_notify *notify[16];

};



static inline struct nouveau_client *