Commit 8f642378 authored by Rob Clark's avatar Rob Clark
Browse files

drm/msm/gem: Move prototypes to msm_gem.h 



Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Reviewed-by: default avatarKristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
parent 8117e5e5

drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c

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



#include "mdp4_kms.h"

#include "msm_gem.h"



struct mdp4_crtc {

	struct drm_crtc base;

drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c

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



#include "mdp5_kms.h"

#include "msm_gem.h"



#define CURSOR_WIDTH	64

#define CURSOR_HEIGHT	64

drivers/gpu/drm/msm/dsi/dsi_host.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "sfpb.xml.h"

#include "dsi_cfg.h"

#include "msm_kms.h"

#include "msm_gem.h"



#define DSI_RESET_TOGGLE_DELAY_MS 20

drivers/gpu/drm/msm/msm_drv.h

+0 −54
Original line number Diff line number Diff line
@@ -274,28 +274,6 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, 
void msm_gem_shrinker_init(struct drm_device *dev);

void msm_gem_shrinker_cleanup(struct drm_device *dev);



int msm_gem_mmap_obj(struct drm_gem_object *obj,

			struct vm_area_struct *vma);

int msm_gem_mmap(struct file *filp, struct vm_area_struct *vma);

vm_fault_t msm_gem_fault(struct vm_fault *vmf);

uint64_t msm_gem_mmap_offset(struct drm_gem_object *obj);

int msm_gem_get_iova(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace, uint64_t *iova);

int msm_gem_get_and_pin_iova_range(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace, uint64_t *iova,

		u64 range_start, u64 range_end);

int msm_gem_get_and_pin_iova(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace, uint64_t *iova);

uint64_t msm_gem_iova(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace);

void msm_gem_unpin_iova(struct drm_gem_object *obj,

		struct msm_gem_address_space *aspace);

struct page **msm_gem_get_pages(struct drm_gem_object *obj);

void msm_gem_put_pages(struct drm_gem_object *obj);

int msm_gem_dumb_create(struct drm_file *file, struct drm_device *dev,

		struct drm_mode_create_dumb *args);

int msm_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev,

		uint32_t handle, uint64_t *offset);

struct sg_table *msm_gem_prime_get_sg_table(struct drm_gem_object *obj);

void *msm_gem_prime_vmap(struct drm_gem_object *obj);

void msm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
@@ -304,38 +282,8 @@ struct drm_gem_object *msm_gem_prime_import_sg_table(struct drm_device *dev, 
		struct dma_buf_attachment *attach, struct sg_table *sg);

int msm_gem_prime_pin(struct drm_gem_object *obj);

void msm_gem_prime_unpin(struct drm_gem_object *obj);

void *msm_gem_get_vaddr(struct drm_gem_object *obj);

void *msm_gem_get_vaddr_active(struct drm_gem_object *obj);

void msm_gem_put_vaddr(struct drm_gem_object *obj);

int msm_gem_madvise(struct drm_gem_object *obj, unsigned madv);

int msm_gem_sync_object(struct drm_gem_object *obj,

		struct msm_fence_context *fctx, bool exclusive);

void msm_gem_active_get(struct drm_gem_object *obj, struct msm_gpu *gpu);

void msm_gem_active_put(struct drm_gem_object *obj);

int msm_gem_cpu_prep(struct drm_gem_object *obj, uint32_t op, ktime_t *timeout);

int msm_gem_cpu_fini(struct drm_gem_object *obj);

void msm_gem_free_object(struct drm_gem_object *obj);

int msm_gem_new_handle(struct drm_device *dev, struct drm_file *file,

		uint32_t size, uint32_t flags, uint32_t *handle, char *name);

struct drm_gem_object *msm_gem_new(struct drm_device *dev,

		uint32_t size, uint32_t flags);

struct drm_gem_object *msm_gem_new_locked(struct drm_device *dev,

		uint32_t size, uint32_t flags);

void *msm_gem_kernel_new(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova);

void *msm_gem_kernel_new_locked(struct drm_device *dev, uint32_t size,

		uint32_t flags, struct msm_gem_address_space *aspace,

		struct drm_gem_object **bo, uint64_t *iova);

void msm_gem_kernel_put(struct drm_gem_object *bo,

		struct msm_gem_address_space *aspace, bool locked);

struct drm_gem_object *msm_gem_import(struct drm_device *dev,

		struct dma_buf *dmabuf, struct sg_table *sgt);

void msm_gem_free_work(struct work_struct *work);



__printf(2, 3)

void msm_gem_object_set_name(struct drm_gem_object *bo, const char *fmt, ...);



int msm_framebuffer_prepare(struct drm_framebuffer *fb,

		struct msm_gem_address_space *aspace);

void msm_framebuffer_cleanup(struct drm_framebuffer *fb,
@@ -453,8 +401,6 @@ void __init msm_dpu_register(void); 
void __exit msm_dpu_unregister(void);



#ifdef CONFIG_DEBUG_FS

void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m);

void msm_gem_describe_objects(struct list_head *list, struct seq_file *m);

void msm_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m);

int msm_debugfs_late_init(struct drm_device *dev);

int msm_rd_debugfs_init(struct drm_minor *minor);

drivers/gpu/drm/msm/msm_fbdev.c

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



#include "msm_drv.h"

#include "msm_gem.h"

#include "msm_kms.h"



extern int msm_gem_mmap_obj(struct drm_gem_object *obj,