Unverified Commit 1c95f662 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge tag 'topic/drmp-cleanup-2019-01-02' of... 

Merge tag 'topic/drmp-cleanup-2019-01-02' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-misc-next

Make some drm headers self-contained with includes and forward declarations

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>

# gpg: Signature made Wed 02 Jan 2019 10:47:51 AM CET
# gpg:                using RSA key 1565A65B77B0632E1124E59CD398079D26ABEE6F
# gpg: Can't check signature: No public key
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/87pntfl6pa.fsf@intel.com
parents c39191fe dd7ece7f

drivers/gpu/drm/drm_bufs.c

+11 −0
Original line number Diff line number Diff line
@@ -377,6 +377,17 @@ int drm_legacy_addmap(struct drm_device *dev, resource_size_t offset, 
}

EXPORT_SYMBOL(drm_legacy_addmap);



struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,

					 unsigned int token)

{

	struct drm_map_list *_entry;

	list_for_each_entry(_entry, &dev->maplist, head)

		if (_entry->user_token == token)

			return _entry->map;

	return NULL;

}

EXPORT_SYMBOL(drm_legacy_findmap);



/**

 * Ioctl to specify a range of memory that is available for mapping by a

 * non-root process.

include/drm/drm_file.h

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


#include <linux/types.h>

#include <linux/completion.h>

#include <linux/idr.h>



#include <uapi/drm/drm.h>

include/drm/drm_hdcp.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef _DRM_HDCP_H_INCLUDED_

#define _DRM_HDCP_H_INCLUDED_



#include <linux/types.h>



/* Period of hdcp checks (to ensure we're still authenticated) */

#define DRM_HDCP_CHECK_PERIOD_MS		(128 * 16)

include/drm/drm_legacy.h

+4 −10
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
#define __DRM_DRM_LEGACY_H__



#include <drm/drm_auth.h>

#include <drm/drm_hashtab.h>



struct drm_device;



/*

 * Legacy driver interfaces for the Direct Rendering Manager
@@ -156,6 +159,7 @@ struct drm_map_list { 
int drm_legacy_addmap(struct drm_device *d, resource_size_t offset,

		      unsigned int size, enum drm_map_type type,

		      enum drm_map_flags flags, struct drm_local_map **map_p);

struct drm_local_map *drm_legacy_findmap(struct drm_device *dev, unsigned int token);

void drm_legacy_rmmap(struct drm_device *d, struct drm_local_map *map);

int drm_legacy_rmmap_locked(struct drm_device *d, struct drm_local_map *map);

void drm_legacy_master_rmmaps(struct drm_device *dev,
@@ -194,14 +198,4 @@ void drm_legacy_ioremap(struct drm_local_map *map, struct drm_device *dev); 
void drm_legacy_ioremap_wc(struct drm_local_map *map, struct drm_device *dev);

void drm_legacy_ioremapfree(struct drm_local_map *map, struct drm_device *dev);



static inline struct drm_local_map *drm_legacy_findmap(struct drm_device *dev,

						       unsigned int token)

{

	struct drm_map_list *_entry;

	list_for_each_entry(_entry, &dev->maplist, head)

	    if (_entry->user_token == token)

		return _entry->map;

	return NULL;

}



#endif /* __DRM_DRM_LEGACY_H__ */

include/drm/drm_syncobj.h

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#ifndef __DRM_SYNCOBJ_H__

#define __DRM_SYNCOBJ_H__



#include "linux/dma-fence.h"

#include <linux/dma-fence.h>



struct drm_file;



/**

 * struct drm_syncobj - sync object.

CRA Git | Maintained and supported by SUSTech CRA and CCSE