Commit 6b5ce4a1 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/vram: Move VRAM memory manager to GEM VRAM implementation 



The separation between GEM VRAM objects and the memory manager is
artificial, as they are only used with each other. Copying both
implementations into the same file is a first step to simplifying
the code.

This patch only moves code without functional changes.

v3:
	* update to use dev->vma_offset_manager
v2:
	* update for debugfs support
	* typos in commit message

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190911110910.30698-2-tzimmermann@suse.de
parent e1218b8c

Documentation/gpu/drm-mm.rst

+0 −12
Original line number Diff line number Diff line
@@ -400,18 +400,6 @@ GEM VRAM Helper Functions Reference 
.. kernel-doc:: drivers/gpu/drm/drm_gem_vram_helper.c

   :export:



VRAM MM Helper Functions Reference

----------------------------------



.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c

   :doc: overview



.. kernel-doc:: include/drm/drm_vram_mm_helper.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_vram_mm_helper.c

   :export:



GEM TTM Helper Functions Reference

-----------------------------------

drivers/gpu/drm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ drm-$(CONFIG_DEBUG_FS) += drm_debugfs.o drm_debugfs_crc.o 
drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o



drm_vram_helper-y := drm_gem_vram_helper.o \

		     drm_vram_helper_common.o \

		     drm_vram_mm_helper.o

		     drm_vram_helper_common.o

obj-$(CONFIG_DRM_VRAM_HELPER) += drm_vram_helper.o



drm_ttm_helper-y := drm_gem_ttm_helper.o

drivers/gpu/drm/ast/ast_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_pci.h>

#include <drm/drm_probe_helper.h>

#include <drm/drm_vram_mm_helper.h>



#include "ast_drv.h"

drivers/gpu/drm/ast/ast_main.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <drm/drm_gem.h>

#include <drm/drm_gem_framebuffer_helper.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_vram_mm_helper.h>



#include "ast_drv.h"

drivers/gpu/drm/ast/ast_ttm.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 


#include <drm/drm_print.h>

#include <drm/drm_gem_vram_helper.h>

#include <drm/drm_vram_mm_helper.h>



#include "ast_drv.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE