svn commit: r317008 - in stable/11/sys: conf dev/drm2 dev/drm2/ttm
Michal Meloun
mmel at FreeBSD.org
Sun Apr 16 07:58:43 UTC 2017
Author: mmel
Date: Sun Apr 16 07:58:41 2017
New Revision: 317008
URL: https://svnweb.freebsd.org/changeset/base/317008
Log:
MFC r308612,r308614:
r308612:
Allow DRM2 code to be built on platforms without AGP. This patch is taken
from original drm-3.8 code.
r308614:
Allow embeding DRM2 code into kernel. It's usefull for development (for
netboot) and it also helps to boot FreeBSD on some embeded platforms (where
we must boot kernel directly, without standard boot loader).
Modified:
stable/11/sys/conf/files
stable/11/sys/dev/drm2/drmP.h
stable/11/sys/dev/drm2/drm_memory.c
stable/11/sys/dev/drm2/drm_os_freebsd.c
stable/11/sys/dev/drm2/drm_os_freebsd.h
stable/11/sys/dev/drm2/ttm/ttm_bo_util.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/conf/files Sun Apr 16 07:58:41 2017 (r317008)
@@ -1451,6 +1451,49 @@ dev/drm/via_map.c optional viadrm
dev/drm/via_mm.c optional viadrm
dev/drm/via_verifier.c optional viadrm
dev/drm/via_video.c optional viadrm
+dev/drm2/drm_agpsupport.c optional drm2
+dev/drm2/drm_auth.c optional drm2
+dev/drm2/drm_bufs.c optional drm2
+dev/drm2/drm_buffer.c optional drm2
+dev/drm2/drm_context.c optional drm2
+dev/drm2/drm_crtc.c optional drm2
+dev/drm2/drm_crtc_helper.c optional drm2
+dev/drm2/drm_dma.c optional drm2
+dev/drm2/drm_dp_helper.c optional drm2
+dev/drm2/drm_dp_iic_helper.c optional drm2
+dev/drm2/drm_drv.c optional drm2
+dev/drm2/drm_edid.c optional drm2
+dev/drm2/drm_fb_helper.c optional drm2
+dev/drm2/drm_fops.c optional drm2
+dev/drm2/drm_gem.c optional drm2
+dev/drm2/drm_gem_names.c optional drm2
+dev/drm2/drm_global.c optional drm2
+dev/drm2/drm_hashtab.c optional drm2
+dev/drm2/drm_ioctl.c optional drm2
+dev/drm2/drm_irq.c optional drm2
+dev/drm2/drm_linux_list_sort.c optional drm2
+dev/drm2/drm_lock.c optional drm2
+dev/drm2/drm_memory.c optional drm2
+dev/drm2/drm_mm.c optional drm2
+dev/drm2/drm_modes.c optional drm2
+dev/drm2/drm_pci.c optional drm2
+dev/drm2/drm_scatter.c optional drm2
+dev/drm2/drm_stub.c optional drm2
+dev/drm2/drm_sysctl.c optional drm2
+dev/drm2/drm_vm.c optional drm2
+dev/drm2/drm_os_freebsd.c optional drm2
+dev/drm2/ttm/ttm_agp_backend.c optional drm2
+dev/drm2/ttm/ttm_lock.c optional drm2
+dev/drm2/ttm/ttm_object.c optional drm2
+dev/drm2/ttm/ttm_tt.c optional drm2
+dev/drm2/ttm/ttm_bo_util.c optional drm2
+dev/drm2/ttm/ttm_bo.c optional drm2
+dev/drm2/ttm/ttm_bo_manager.c optional drm2
+dev/drm2/ttm/ttm_execbuf_util.c optional drm2
+dev/drm2/ttm/ttm_memory.c optional drm2
+dev/drm2/ttm/ttm_page_alloc.c optional drm2
+dev/drm2/ttm/ttm_bo_vm.c optional drm2
+dev/drm2/ati_pcigart.c optional drm2 agp pci
dev/ed/if_ed.c optional ed
dev/ed/if_ed_novell.c optional ed
dev/ed/if_ed_rtl80x9.c optional ed
Modified: stable/11/sys/dev/drm2/drmP.h
==============================================================================
--- stable/11/sys/dev/drm2/drmP.h Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/dev/drm2/drmP.h Sun Apr 16 07:58:41 2017 (r317008)
@@ -1204,17 +1204,6 @@ int drm_mmap_single(struct cdev *kdev, v
vm_size_t size, struct vm_object **obj_res, int nprot);
d_poll_t drm_poll;
- /* Memory management support (drm_memory.h) */
-extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
-extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
-#ifdef FREEBSD_NOTYET
-extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
- struct page **pages,
- unsigned long num_pages,
- uint32_t gtt_offset,
- uint32_t type);
-#endif /* FREEBSD_NOTYET */
-extern int drm_unbind_agp(DRM_AGP_MEM * handle);
/* Misc. IOCTL support (drm_ioctl.h) */
extern int drm_irq_by_busid(struct drm_device *dev, void *data,
@@ -1363,32 +1352,6 @@ extern void drm_vblank_post_modeset(stru
extern int drm_modeset_ctl(struct drm_device *dev, void *data,
struct drm_file *file_priv);
- /* AGP/GART support (drm_agpsupport.h) */
-extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
-extern int drm_agp_acquire(struct drm_device *dev);
-extern int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_release(struct drm_device *dev);
-extern int drm_agp_release_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
-extern int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info);
-extern int drm_agp_info_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
-extern int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
-extern int drm_agp_free_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
-extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
-extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
/* Stub support (drm_stub.h) */
extern int drm_setmaster_ioctl(struct drm_device *dev, void *data,
@@ -1814,5 +1777,175 @@ int ttm_bo_mmap_single(struct ttm_bo_dev
struct ttm_buffer_object;
void ttm_bo_release_mmap(struct ttm_buffer_object *bo);
+#if __OS_HAS_AGP
+ /* Memory management support (drm_memory.h) */
+extern void drm_free_agp(DRM_AGP_MEM * handle, int pages);
+extern int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start);
+#ifdef FREEBSD_NOTYET
+extern DRM_AGP_MEM *drm_agp_bind_pages(struct drm_device *dev,
+ struct page **pages,
+ unsigned long num_pages,
+ uint32_t gtt_offset,
+ uint32_t type);
+#endif /* FREEBSD_NOTYET */
+extern int drm_unbind_agp(DRM_AGP_MEM * handle);
+
+ /* AGP/GART support (drm_agpsupport.h) */
+extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
+extern int drm_agp_acquire(struct drm_device *dev);
+extern int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_release(struct drm_device *dev);
+extern int drm_agp_release_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_enable(struct drm_device *dev, struct drm_agp_mode mode);
+extern int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_info(struct drm_device *dev, struct drm_agp_info *info);
+extern int drm_agp_info_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_alloc(struct drm_device *dev, struct drm_agp_buffer *request);
+extern int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_free(struct drm_device *dev, struct drm_agp_buffer *request);
+extern int drm_agp_free_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_unbind(struct drm_device *dev, struct drm_agp_binding *request);
+extern int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+extern int drm_agp_bind(struct drm_device *dev, struct drm_agp_binding *request);
+extern int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+
+#else
+
+static inline void drm_free_agp(DRM_AGP_MEM * handle, int pages)
+{
+}
+
+static inline int drm_bind_agp(DRM_AGP_MEM * handle, unsigned int start)
+{
+ return -ENODEV;
+}
+
+static inline int drm_unbind_agp(DRM_AGP_MEM * handle)
+{
+ return -ENODEV;
+}
+#ifdef FREEBSD_NOTYET
+static inline struct agp_memory *drm_agp_bind_pages(struct drm_device *dev,
+ struct page **pages,
+ unsigned long num_pages,
+ uint32_t gtt_offset,
+ uint32_t type)
+{
+ return NULL;
+}
+#endif
+static inline struct drm_agp_head *drm_agp_init(struct drm_device *dev)
+{
+ return NULL;
+}
+
+static inline void drm_agp_clear(struct drm_device *dev)
+{
+}
+
+static inline int drm_agp_acquire(struct drm_device *dev)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_acquire_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_release(struct drm_device *dev)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_release_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_enable(struct drm_device *dev,
+ struct drm_agp_mode mode)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_enable_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_info(struct drm_device *dev,
+ struct drm_agp_info *info)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_info_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_alloc(struct drm_device *dev,
+ struct drm_agp_buffer *request)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_alloc_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_free(struct drm_device *dev,
+ struct drm_agp_buffer *request)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_free_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_unbind(struct drm_device *dev,
+ struct drm_agp_binding *request)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_unbind_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_bind(struct drm_device *dev,
+ struct drm_agp_binding *request)
+{
+ return -ENODEV;
+}
+
+static inline int drm_agp_bind_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv)
+{
+ return -ENODEV;
+}
+
+#endif /* __OS_HAS_AGP */
+
#endif /* __KERNEL__ */
#endif
Modified: stable/11/sys/dev/drm2/drm_memory.c
==============================================================================
--- stable/11/sys/dev/drm2/drm_memory.c Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/dev/drm2/drm_memory.c Sun Apr 16 07:58:41 2017 (r317008)
@@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$");
#include <dev/drm2/drmP.h>
+#define vunmap(handle)
+
#if __OS_HAS_AGP
static void *agp_remap(unsigned long offset, unsigned long size,
struct drm_device * dev)
@@ -50,8 +52,6 @@ static void *agp_remap(unsigned long off
return NULL;
}
-#define vunmap(handle)
-
/** Wrapper around agp_free_memory() */
void drm_free_agp(DRM_AGP_MEM * handle, int pages)
{
Modified: stable/11/sys/dev/drm2/drm_os_freebsd.c
==============================================================================
--- stable/11/sys/dev/drm2/drm_os_freebsd.c Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/dev/drm2/drm_os_freebsd.c Sun Apr 16 07:58:41 2017 (r317008)
@@ -347,6 +347,7 @@ dmi_check_system(const struct dmi_system
return (res);
}
+#if __OS_HAS_MTRR
int
drm_mtrr_add(unsigned long offset, unsigned long size, unsigned int flags)
{
@@ -375,6 +376,7 @@ drm_mtrr_del(int handle __unused, unsign
strlcpy(mrdesc.mr_owner, "drm", sizeof(mrdesc.mr_owner));
return (-mem_range_attr_set(&mrdesc, &act));
}
+#endif
void
drm_clflush_pages(vm_page_t *pages, unsigned long num_pages)
Modified: stable/11/sys/dev/drm2/drm_os_freebsd.h
==============================================================================
--- stable/11/sys/dev/drm2/drm_os_freebsd.h Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/dev/drm2/drm_os_freebsd.h Sun Apr 16 07:58:41 2017 (r317008)
@@ -591,8 +591,10 @@ typedef struct drm_pci_id_list
#define CONFIG_COMPAT
#endif
+#ifndef __arm__
#define CONFIG_AGP 1
#define CONFIG_MTRR 1
+#endif
#define CONFIG_FB 1
extern const char *fb_mode_option;
Modified: stable/11/sys/dev/drm2/ttm/ttm_bo_util.c
==============================================================================
--- stable/11/sys/dev/drm2/ttm/ttm_bo_util.c Sun Apr 16 07:43:29 2017 (r317007)
+++ stable/11/sys/dev/drm2/ttm/ttm_bo_util.c Sun Apr 16 07:58:41 2017 (r317008)
@@ -439,7 +439,8 @@ ttm_buffer_object_transfer(struct ttm_bu
vm_memattr_t
ttm_io_prot(uint32_t caching_flags)
{
-#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__)
+#if defined(__i386__) || defined(__amd64__) || defined(__powerpc__) || \
+ defined(__arm__)
if (caching_flags & TTM_PL_FLAG_WC)
return (VM_MEMATTR_WRITE_COMBINING);
else
More information about the svn-src-all
mailing list