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

Commit ba8286fa authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm: Move legacy buffer structures to <drm/drm_legacy.h> 



A few odd cases:
- mgag200 someho had a totally unused drm_dma_handle_t. Remove it.
- i915 still uses the legacy pci dma alloc api, so grows an include.

Everything else fairly standard.

v2: Include "drm_legacy.h" in drm.ko source files for consistency.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 86c1fbd5

drivers/gpu/drm/drm_dma.c

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


#include <linux/export.h>

#include <drm/drmP.h>

#include "drm_legacy.h"



/**

 * Initialize the DMA data.

drivers/gpu/drm/drm_info.c

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


#include <linux/seq_file.h>

#include <drm/drmP.h>

#include "drm_legacy.h"



/**

 * Called when "/proc/dri/.../name" is read.

drivers/gpu/drm/drm_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/dma-mapping.h>

#include <linux/export.h>

#include <drm/drmP.h>

#include "drm_legacy.h"



/**

 * drm_pci_alloc - Allocate a PCI consistent memory block, for DMA.

drivers/gpu/drm/i915/i915_drv.h

+6 −3
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <linux/i2c.h>

#include <linux/i2c-algo-bit.h>

#include <drm/intel-gtt.h>

#include <drm/drm_legacy.h> /* for struct drm_dma_handle */

#include <linux/backlight.h>

#include <linux/hashtable.h>

#include <linux/intel-iommu.h>
@@ -285,8 +286,10 @@ struct intel_opregion { 
struct intel_overlay;

struct intel_overlay_error_state;



struct drm_local_map;



struct drm_i915_master_private {

	drm_local_map_t *sarea;

	struct drm_local_map *sarea;

	struct _drm_i915_sarea *sarea_priv;

};

#define I915_FENCE_REG_NONE -1
@@ -1447,7 +1450,7 @@ struct drm_i915_private { 
	struct drm_i915_gem_object *semaphore_obj;

	uint32_t last_seqno, next_seqno;



	drm_dma_handle_t *status_page_dmah;

	struct drm_dma_handle *status_page_dmah;

	struct resource mch_res;



	/* protects the irq masks */
@@ -1834,7 +1837,7 @@ struct drm_i915_gem_object { 
	struct drm_file *pin_filp;



	/** for phy allocated objects */

	drm_dma_handle_t *phys_handle;

	struct drm_dma_handle *phys_handle;



	union {

		struct i915_gem_userptr {

drivers/gpu/drm/mgag200/mgag200_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -190,8 +190,6 @@ struct mga_device { 
	resource_size_t			rmmio_size;

	void __iomem			*rmmio;



	drm_local_map_t			*framebuffer;



	struct mga_mc			mc;

	struct mga_mode_info		mode_info;