| Message ID | 20190903101248.12879-4-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: add some ttm/vram info to debugfs | expand |
On Tue, Sep 03, 2019 at 12:12:45PM +0200, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_gem_vram_helper.c | 4 +++- > drivers/gpu/drm/Kconfig | 1 + > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c > index fd751078bae1..71552f757b4a 100644 > --- a/drivers/gpu/drm/drm_gem_vram_helper.c > +++ b/drivers/gpu/drm/drm_gem_vram_helper.c > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0-or-later > > +#include <drm/drm_gem_ttm_helper.h> > #include <drm/drm_gem_vram_helper.h> > #include <drm/drm_device.h> > #include <drm/drm_mode.h> > @@ -633,5 +634,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { > .pin = drm_gem_vram_object_pin, > .unpin = drm_gem_vram_object_unpin, > .vmap = drm_gem_vram_object_vmap, > - .vunmap = drm_gem_vram_object_vunmap > + .vunmap = drm_gem_vram_object_vunmap, > + .print_info = drm_gem_ttm_print_info, Yeah definitely link to the new way of doing stuff in the kerneldoc of the previous patch. For this. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> > }; > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index f7b25519f95c..1be8ad30d8fe 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -169,6 +169,7 @@ config DRM_VRAM_HELPER > tristate > depends on DRM > select DRM_TTM > + select DRM_TTM_HELPER Select isn't recursive, which means anyone who selects vram helpers now also needs to select ttm helpers. This is already broken with DRM_TTM I think ... -Daniel > help > Helpers for VRAM memory management > > -- > 2.18.1 >
diff --git a/drivers/gpu/drm/drm_gem_vram_helper.c b/drivers/gpu/drm/drm_gem_vram_helper.c index fd751078bae1..71552f757b4a 100644 --- a/drivers/gpu/drm/drm_gem_vram_helper.c +++ b/drivers/gpu/drm/drm_gem_vram_helper.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later +#include <drm/drm_gem_ttm_helper.h> #include <drm/drm_gem_vram_helper.h> #include <drm/drm_device.h> #include <drm/drm_mode.h> @@ -633,5 +634,6 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs = { .pin = drm_gem_vram_object_pin, .unpin = drm_gem_vram_object_unpin, .vmap = drm_gem_vram_object_vmap, - .vunmap = drm_gem_vram_object_vunmap + .vunmap = drm_gem_vram_object_vunmap, + .print_info = drm_gem_ttm_print_info, }; diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index f7b25519f95c..1be8ad30d8fe 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -169,6 +169,7 @@ config DRM_VRAM_HELPER tristate depends on DRM select DRM_TTM + select DRM_TTM_HELPER help Helpers for VRAM memory management