Re: [Nouveau] [PATCH 12/12] drm/nouveau: support for probing GK20A
On Wed, Mar 26, 2014 at 1:28 PM, Ben Skeggs skeg...@gmail.com wrote: On Mon, Mar 24, 2014 at 6:42 PM, Alexandre Courbot acour...@nvidia.com wrote: Set the correct subdev/engine classes when GK20A (0xea) is probed. Signed-off-by: Alexandre Courbot acour...@nvidia.com --- drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 20 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c index 987edbc30a09..8509dd57de1f 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c @@ -156,6 +156,26 @@ nve0_identify(struct nouveau_device *device) device-oclass[NVDEV_ENGINE_PPP] = nvc0_ppp_oclass; device-oclass[NVDEV_ENGINE_PERFMON] = nve0_perfmon_oclass; break; + case 0xea: + device-cname = GK20A; + device-oclass[NVDEV_SUBDEV_MC ] = nvc3_mc_oclass; + device-oclass[NVDEV_SUBDEV_BUS] = nvc0_bus_oclass; + device-oclass[NVDEV_SUBDEV_TIMER ] = nv04_timer_oclass; As per note on the PTIMER patch, can just switch this to gk20a_timer_oclass on the latest code. Just saw your patch and will try to use it for the next version (if I can figure out how to reapply it to a Linux tree). ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH 12/12] drm/nouveau: support for probing GK20A
On Mon, Mar 24, 2014 at 6:42 PM, Alexandre Courbot acour...@nvidia.com wrote: Set the correct subdev/engine classes when GK20A (0xea) is probed. Signed-off-by: Alexandre Courbot acour...@nvidia.com --- drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 20 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c index 987edbc30a09..8509dd57de1f 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c @@ -156,6 +156,26 @@ nve0_identify(struct nouveau_device *device) device-oclass[NVDEV_ENGINE_PPP] = nvc0_ppp_oclass; device-oclass[NVDEV_ENGINE_PERFMON] = nve0_perfmon_oclass; break; + case 0xea: + device-cname = GK20A; + device-oclass[NVDEV_SUBDEV_MC ] = nvc3_mc_oclass; + device-oclass[NVDEV_SUBDEV_BUS] = nvc0_bus_oclass; + device-oclass[NVDEV_SUBDEV_TIMER ] = nv04_timer_oclass; As per note on the PTIMER patch, can just switch this to gk20a_timer_oclass on the latest code. + device-oclass[NVDEV_SUBDEV_FB ] = nvea_fb_oclass; + device-oclass[NVDEV_SUBDEV_IBUS ] = nvea_ibus_oclass; + device-oclass[NVDEV_SUBDEV_INSTMEM] = nv50_instmem_oclass; + device-oclass[NVDEV_SUBDEV_VM ] = nvc0_vmmgr_oclass; + device-oclass[NVDEV_SUBDEV_BAR] = nvc0_bar_oclass; + device-oclass[NVDEV_ENGINE_DMAOBJ ] = nvd0_dmaeng_oclass; + device-oclass[NVDEV_ENGINE_FIFO ] = nvea_fifo_oclass; + /* TODO will need an implementation for this at some point... */ +#if 0 + device-oclass[NVDEV_ENGINE_SW ] = nvc0_software_oclass; +#endif + device-oclass[NVDEV_ENGINE_GR ] = nvea_graph_oclass; + device-oclass[NVDEV_ENGINE_COPY2 ] = nve0_copy2_oclass; + device-oclass[NVDEV_ENGINE_PERFMON] = nve0_perfmon_oclass; + break; case 0xf0: device-cname = GK110; device-oclass[NVDEV_SUBDEV_VBIOS ] = nouveau_bios_oclass; -- 1.9.1 ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
[Nouveau] [PATCH 12/12] drm/nouveau: support for probing GK20A
Set the correct subdev/engine classes when GK20A (0xea) is probed. Signed-off-by: Alexandre Courbot acour...@nvidia.com --- drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 20 1 file changed, 20 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c index 987edbc30a09..8509dd57de1f 100644 --- a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c +++ b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c @@ -156,6 +156,26 @@ nve0_identify(struct nouveau_device *device) device-oclass[NVDEV_ENGINE_PPP] = nvc0_ppp_oclass; device-oclass[NVDEV_ENGINE_PERFMON] = nve0_perfmon_oclass; break; + case 0xea: + device-cname = GK20A; + device-oclass[NVDEV_SUBDEV_MC ] = nvc3_mc_oclass; + device-oclass[NVDEV_SUBDEV_BUS] = nvc0_bus_oclass; + device-oclass[NVDEV_SUBDEV_TIMER ] = nv04_timer_oclass; + device-oclass[NVDEV_SUBDEV_FB ] = nvea_fb_oclass; + device-oclass[NVDEV_SUBDEV_IBUS ] = nvea_ibus_oclass; + device-oclass[NVDEV_SUBDEV_INSTMEM] = nv50_instmem_oclass; + device-oclass[NVDEV_SUBDEV_VM ] = nvc0_vmmgr_oclass; + device-oclass[NVDEV_SUBDEV_BAR] = nvc0_bar_oclass; + device-oclass[NVDEV_ENGINE_DMAOBJ ] = nvd0_dmaeng_oclass; + device-oclass[NVDEV_ENGINE_FIFO ] = nvea_fifo_oclass; + /* TODO will need an implementation for this at some point... */ +#if 0 + device-oclass[NVDEV_ENGINE_SW ] = nvc0_software_oclass; +#endif + device-oclass[NVDEV_ENGINE_GR ] = nvea_graph_oclass; + device-oclass[NVDEV_ENGINE_COPY2 ] = nve0_copy2_oclass; + device-oclass[NVDEV_ENGINE_PERFMON] = nve0_perfmon_oclass; + break; case 0xf0: device-cname = GK110; device-oclass[NVDEV_SUBDEV_VBIOS ] = nouveau_bios_oclass; -- 1.9.1 ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
Re: [Nouveau] [PATCH 12/12] drm/nouveau: support for probing GK20A
On Mon, Mar 24, 2014 at 05:42:34PM +0900, Alexandre Courbot wrote: [...] diff --git a/drivers/gpu/drm/nouveau/core/engine/device/nve0.c b/drivers/gpu/drm/nouveau/core/engine/device/nve0.c [...] + /* TODO will need an implementation for this at some point... */ Do we? If so the commit message in 11/12 is misleading. Thierry pgpEg6QipX3Bd.pgp Description: PGP signature ___ Nouveau mailing list Nouveau@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/nouveau
