On Tue, 2019-02-05 at 06:26 +0000, Alyssa Rosenzweig wrote: > In addition to the DRM interface in active development, for legacy > kernels Panfrost has a small, optional, out-of-tree glue repository. > For > various reasons, this legacy code should not be included in Mesa > proper, > but this commit allows it to coexist peacefully with upstream > Panfrost. > If the nondrm repo is cloned/symlinked to the directory > `src/gallium/drivers/panfrost/nondrm`, legacy functionality will be > built. Otherwise, the driver will build normally, though a runtime > error > message will be printed if a legacy kernel is detected. > > This workaround is icky, but it allows a nearly-upstream Panfrost to > work on real hardware, today. Ideally, this patch will be reverted > when > the Panfrost kernel module is mature and we drop legacy support. > > Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> > --- > src/gallium/drivers/panfrost/.gitignore | 1 + > src/gallium/drivers/panfrost/meson.build | 21 ++++++++++++++++++ > --- > src/gallium/drivers/panfrost/pan_context.c | 3 ++- > src/gallium/drivers/panfrost/pan_screen.c | 9 +++++++-- > src/gallium/drivers/panfrost/pan_screen.h | 2 +- > 5 files changed, 29 insertions(+), 7 deletions(-) > create mode 100644 src/gallium/drivers/panfrost/.gitignore > > diff --git a/src/gallium/drivers/panfrost/.gitignore > b/src/gallium/drivers/panfrost/.gitignore > new file mode 100644 > index 00000000000..9d2c2c18bef > --- /dev/null > +++ b/src/gallium/drivers/panfrost/.gitignore > @@ -0,0 +1 @@ > +nondrm > diff --git a/src/gallium/drivers/panfrost/meson.build > b/src/gallium/drivers/panfrost/meson.build > index 9b90035d691..5e799eae119 100644 > --- a/src/gallium/drivers/panfrost/meson.build > +++ b/src/gallium/drivers/panfrost/meson.build > @@ -39,7 +39,7 @@ files_panfrost = files( > 'pan_blending.c', > 'pan_blend_shaders.c', > 'pan_wallpaper.c', > - 'pan_pretty_print.c' > + 'pan_pretty_print.c', > ) > > inc_panfrost = [
This hunk seems unrelated... _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
