Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d6e1cb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airlied/linux 

Pull dma-buf prime support from Dave Airlie:
 "This isn't a majorly urgent thing to have, but we'd like to set the
  stage for working on dma-buf support in the drm drivers for the next
  merge window, so I'd like to push in the initial submission now so
  people have something that we can build on top of.  The code just
  introduces the user interface and internal helper functions for
  drivers to use.

  We have driver support under development for i915, nouveau, udl on x86
  and exynos, omapdrm on arm, which we would be aiming for the next
  merge window."

In the -rc1 announcement I asked for people who would use this to
comment on it, and got severa "Yes please" from people for this and for
HSI (that I merged earlier).

So far crickets on pohmelfs and the DMA-mapping infrastructure.

* 'drm-prime-dmabuf-initial' of git://people.freedesktop.org/~airlied/linux:
  drm: base prime/dma-buf support (v5)
parents ed359a3b 3248877e

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ menuconfig DRM 
	depends on (AGP || AGP=n) && !EMULATED_CMPXCHG && MMU

	select I2C

	select I2C_ALGOBIT

	select DMA_SHARED_BUFFER

	help

	  Kernel-level support for the Direct Rendering Infrastructure (DRI)

	  introduced in XFree86 4.0. If you say Y here, you need to select

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ drm-y := drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \ 
		drm_platform.o drm_sysfs.o drm_hashtab.o drm_mm.o \

		drm_crtc.o drm_modes.o drm_edid.o \

		drm_info.o drm_debugfs.o drm_encoder_slave.o \

		drm_trace_points.o drm_global.o

		drm_trace_points.o drm_global.o drm_prime.o



drm-$(CONFIG_COMPAT) += drm_ioc32.o

drivers/gpu/drm/drm_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ static struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_GEM_OPEN, drm_gem_open_ioctl, DRM_AUTH|DRM_UNLOCKED),



	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETRESOURCES, drm_mode_getresources, DRM_CONTROL_ALLOW|DRM_UNLOCKED),



	DRM_IOCTL_DEF(DRM_IOCTL_PRIME_HANDLE_TO_FD, drm_prime_handle_to_fd_ioctl, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_PRIME_FD_TO_HANDLE, drm_prime_fd_to_handle_ioctl, DRM_AUTH|DRM_UNLOCKED),



	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETPLANERESOURCES, drm_mode_getplane_res, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_GETCRTC, drm_mode_getcrtc, DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_SETCRTC, drm_mode_setcrtc, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

drivers/gpu/drm/drm_fops.c

+7 −0
Original line number Diff line number Diff line
@@ -271,6 +271,9 @@ static int drm_open_helper(struct inode *inode, struct file *filp, 
	if (dev->driver->driver_features & DRIVER_GEM)

		drm_gem_open(dev, priv);



	if (drm_core_check_feature(dev, DRIVER_PRIME))

		drm_prime_init_file_private(&priv->prime);



	if (dev->driver->open) {

		ret = dev->driver->open(dev, priv);

		if (ret < 0)
@@ -571,6 +574,10 @@ int drm_release(struct inode *inode, struct file *filp) 


	if (dev->driver->postclose)

		dev->driver->postclose(dev, file_priv);



	if (drm_core_check_feature(dev, DRIVER_PRIME))

		drm_prime_destroy_file_private(&file_priv->prime);



	kfree(file_priv);



	/* ========================================================

drivers/gpu/drm/drm_gem.c

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/mman.h>

#include <linux/pagemap.h>

#include <linux/shmem_fs.h>

#include <linux/dma-buf.h>

#include "drmP.h"



/** @file drm_gem.c
@@ -232,6 +233,10 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) 
	idr_remove(&filp->object_idr, handle);

	spin_unlock(&filp->table_lock);



	if (obj->import_attach)

		drm_prime_remove_imported_buf_handle(&filp->prime,

				obj->import_attach->dmabuf);



	if (dev->driver->gem_close_object)

		dev->driver->gem_close_object(obj, filp);

	drm_gem_object_handle_unreference_unlocked(obj);
@@ -527,6 +532,10 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) 
	struct drm_gem_object *obj = ptr;

	struct drm_device *dev = obj->dev;



	if (obj->import_attach)

		drm_prime_remove_imported_buf_handle(&file_priv->prime,

				obj->import_attach->dmabuf);



	if (dev->driver->gem_close_object)

		dev->driver->gem_close_object(obj, file_priv);