On 05/01/2014 04:11 PM, Ben Skeggs wrote: > On Fri, Apr 25, 2014 at 5:19 PM, Alexandre Courbot <acourbot at nvidia.com> > wrote: >> Changes since v2: >> - Enabled software class >> - Removed unneeded changes to nouveau_accel_init() >> - Replaced use of architecture-private pfn_to_dma() and dma_to_pfn() with >> the portable page_to_phys()/phys_to_page() > page_to_phys() looks well defined and used everywhere, phys_to_page() > not so much (including on amd64) :(
Argh, dammit. Now I *really* wonder what one is supposed to use in such cases... Let me come with a v4 then. I will address the other issue with external firmware at the same time. Sorry for the inconvenience. > >> - Fixed incorrect comment/commit log talking about bytes instead of words >> >> Hope this looks good! Once this gets merged the next set will be to use this >> driver on Jetson and Venice2 boards. >> >> Cheers, >> >> Alexandre Courbot (9): >> drm/nouveau/bar: only ioremap BAR3 if it exists >> drm/nouveau/bar/nvc0: support chips without BAR3 >> drm/nouveau/ibus: add GK20A support >> drm/nouveau/fb: add GK20A support >> drm/nouveau/fifo: add GK20A support >> drm/nouveau/graph: enable when using external firmware >> drm/nouveau/graph: pad firmware code at load time >> drm/nouveau/graph: add GK20A support >> drm/nouveau: support for probing GK20A >> >> drivers/gpu/drm/nouveau/Makefile | 6 + >> drivers/gpu/drm/nouveau/core/engine/device/nve0.c | 17 +++ >> drivers/gpu/drm/nouveau/core/engine/fifo/gk20a.c | 35 +++++ >> drivers/gpu/drm/nouveau/core/engine/fifo/nve0.h | 1 + >> .../gpu/drm/nouveau/core/engine/graph/ctxgk20a.c | 53 +++++++ >> .../gpu/drm/nouveau/core/engine/graph/ctxnvc0.h | 9 ++ >> .../gpu/drm/nouveau/core/engine/graph/ctxnve4.c | 14 +- >> drivers/gpu/drm/nouveau/core/engine/graph/gk20a.c | 47 ++++++ >> drivers/gpu/drm/nouveau/core/engine/graph/nvc0.c | 13 +- >> drivers/gpu/drm/nouveau/core/engine/graph/nvc0.h | 2 + >> drivers/gpu/drm/nouveau/core/engine/graph/nve4.c | 4 +- >> drivers/gpu/drm/nouveau/core/include/engine/fifo.h | 1 + >> .../gpu/drm/nouveau/core/include/engine/graph.h | 1 + >> drivers/gpu/drm/nouveau/core/include/subdev/fb.h | 1 + >> drivers/gpu/drm/nouveau/core/include/subdev/ibus.h | 1 + >> drivers/gpu/drm/nouveau/core/subdev/bar/base.c | 6 +- >> drivers/gpu/drm/nouveau/core/subdev/bar/nvc0.c | 114 +++++++------- >> drivers/gpu/drm/nouveau/core/subdev/fb/gk20a.c | 56 +++++++ >> drivers/gpu/drm/nouveau/core/subdev/fb/priv.h | 1 + >> drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c | 167 >> +++++++++++++++++++++ >> drivers/gpu/drm/nouveau/core/subdev/ibus/gk20a.c | 103 +++++++++++++ >> 21 files changed, 583 insertions(+), 69 deletions(-) >> create mode 100644 drivers/gpu/drm/nouveau/core/engine/fifo/gk20a.c >> create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/ctxgk20a.c >> create mode 100644 drivers/gpu/drm/nouveau/core/engine/graph/gk20a.c >> create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/gk20a.c >> create mode 100644 drivers/gpu/drm/nouveau/core/subdev/fb/ramgk20a.c >> create mode 100644 drivers/gpu/drm/nouveau/core/subdev/ibus/gk20a.c >> >> -- >> 1.9.2 >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel at lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel
