drm/nouveau: pull nouveau_gem definitions into their own header
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
8be21a6402
commit
66f247234d
|
@ -105,15 +105,7 @@ struct nouveau_mem;
|
||||||
#define NOUVEAU_MAX_TILE_NR 15
|
#define NOUVEAU_MAX_TILE_NR 15
|
||||||
|
|
||||||
#include "nouveau_bo.h"
|
#include "nouveau_bo.h"
|
||||||
|
#include "nouveau_gem.h"
|
||||||
#define nouveau_bo_tile_layout(nvbo) \
|
|
||||||
((nvbo)->tile_flags & NOUVEAU_GEM_TILE_LAYOUT_MASK)
|
|
||||||
|
|
||||||
static inline struct nouveau_bo *
|
|
||||||
nouveau_gem_object(struct drm_gem_object *gem)
|
|
||||||
{
|
|
||||||
return gem ? gem->driver_private : NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* TODO: submit equivalent to TTM generic API upstream? */
|
/* TODO: submit equivalent to TTM generic API upstream? */
|
||||||
static inline void __iomem *
|
static inline void __iomem *
|
||||||
|
@ -874,30 +866,6 @@ void nvd0_display_flip_stop(struct drm_crtc *);
|
||||||
int nvd0_display_flip_next(struct drm_crtc *, struct drm_framebuffer *,
|
int nvd0_display_flip_next(struct drm_crtc *, struct drm_framebuffer *,
|
||||||
struct nouveau_channel *, u32 swap_interval);
|
struct nouveau_channel *, u32 swap_interval);
|
||||||
|
|
||||||
/* nouveau_gem.c */
|
|
||||||
extern int nouveau_gem_new(struct drm_device *, int size, int align,
|
|
||||||
uint32_t domain, uint32_t tile_mode,
|
|
||||||
uint32_t tile_flags, struct nouveau_bo **);
|
|
||||||
extern int nouveau_gem_object_new(struct drm_gem_object *);
|
|
||||||
extern void nouveau_gem_object_del(struct drm_gem_object *);
|
|
||||||
extern int nouveau_gem_object_open(struct drm_gem_object *, struct drm_file *);
|
|
||||||
extern void nouveau_gem_object_close(struct drm_gem_object *,
|
|
||||||
struct drm_file *);
|
|
||||||
extern int nouveau_gem_ioctl_new(struct drm_device *, void *,
|
|
||||||
struct drm_file *);
|
|
||||||
extern int nouveau_gem_ioctl_pushbuf(struct drm_device *, void *,
|
|
||||||
struct drm_file *);
|
|
||||||
extern int nouveau_gem_ioctl_cpu_prep(struct drm_device *, void *,
|
|
||||||
struct drm_file *);
|
|
||||||
extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,
|
|
||||||
struct drm_file *);
|
|
||||||
extern int nouveau_gem_ioctl_info(struct drm_device *, void *,
|
|
||||||
struct drm_file *);
|
|
||||||
|
|
||||||
extern struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev,
|
|
||||||
struct drm_gem_object *obj, int flags);
|
|
||||||
extern struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev,
|
|
||||||
struct dma_buf *dma_buf);
|
|
||||||
|
|
||||||
/* nouveau_display.c */
|
/* nouveau_display.c */
|
||||||
int nouveau_display_create(struct drm_device *dev);
|
int nouveau_display_create(struct drm_device *dev);
|
||||||
|
|
43
drivers/gpu/drm/nouveau/nouveau_gem.h
Normal file
43
drivers/gpu/drm/nouveau/nouveau_gem.h
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
#ifndef __NOUVEAU_GEM_H__
|
||||||
|
#define __NOUVEAU_GEM_H__
|
||||||
|
|
||||||
|
#include "drmP.h"
|
||||||
|
|
||||||
|
#include <nouveau_drm.h>
|
||||||
|
#include "nouveau_bo.h"
|
||||||
|
|
||||||
|
#define nouveau_bo_tile_layout(nvbo) \
|
||||||
|
((nvbo)->tile_flags & NOUVEAU_GEM_TILE_LAYOUT_MASK)
|
||||||
|
|
||||||
|
static inline struct nouveau_bo *
|
||||||
|
nouveau_gem_object(struct drm_gem_object *gem)
|
||||||
|
{
|
||||||
|
return gem ? gem->driver_private : NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* nouveau_gem.c */
|
||||||
|
extern int nouveau_gem_new(struct drm_device *, int size, int align,
|
||||||
|
uint32_t domain, uint32_t tile_mode,
|
||||||
|
uint32_t tile_flags, struct nouveau_bo **);
|
||||||
|
extern int nouveau_gem_object_new(struct drm_gem_object *);
|
||||||
|
extern void nouveau_gem_object_del(struct drm_gem_object *);
|
||||||
|
extern int nouveau_gem_object_open(struct drm_gem_object *, struct drm_file *);
|
||||||
|
extern void nouveau_gem_object_close(struct drm_gem_object *,
|
||||||
|
struct drm_file *);
|
||||||
|
extern int nouveau_gem_ioctl_new(struct drm_device *, void *,
|
||||||
|
struct drm_file *);
|
||||||
|
extern int nouveau_gem_ioctl_pushbuf(struct drm_device *, void *,
|
||||||
|
struct drm_file *);
|
||||||
|
extern int nouveau_gem_ioctl_cpu_prep(struct drm_device *, void *,
|
||||||
|
struct drm_file *);
|
||||||
|
extern int nouveau_gem_ioctl_cpu_fini(struct drm_device *, void *,
|
||||||
|
struct drm_file *);
|
||||||
|
extern int nouveau_gem_ioctl_info(struct drm_device *, void *,
|
||||||
|
struct drm_file *);
|
||||||
|
|
||||||
|
extern struct dma_buf *nouveau_gem_prime_export(struct drm_device *dev,
|
||||||
|
struct drm_gem_object *obj, int flags);
|
||||||
|
extern struct drm_gem_object *nouveau_gem_prime_import(struct drm_device *dev,
|
||||||
|
struct dma_buf *dma_buf);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in a new issue