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

Commit 0673ad47 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Merge i915_dma.c into i915_drv.c 



i915_dma.c used to contain the DRI1/UMS horror show, but now all that
remains are the out-of-place driver level interfaces (such as
allocating, initialising and registering the driver). These should be in
i915_drv.c alongside similar routines for suspend/resume.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466773227-7994-10-git-send-email-chris@chris-wilson.co.uk
parent 091387c1

drivers/gpu/drm/i915/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ i915-y += dvo_ch7017.o \ 
# virtual gpu code

i915-y += i915_vgpu.o



# legacy horrors

i915-y += i915_dma.o



ifeq ($(CONFIG_DRM_I915_GVT),y)

i915-y += intel_gvt.o

include $(src)/gvt/Makefile

drivers/gpu/drm/i915/i915_dma.c

deleted100644 → 0
+0 −1715

File deleted.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_drv.c

+1875 −210

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_drv.h

+1 −15
Original line number Diff line number Diff line
@@ -2894,16 +2894,13 @@ struct drm_i915_cmd_table { 


#include "i915_trace.h"



extern const struct drm_ioctl_desc i915_ioctls[];

extern int i915_max_ioctl;



extern int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state);

extern int i915_resume_switcheroo(struct drm_device *dev);



int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,

			       	int enable_ppgtt);



/* i915_dma.c */

/* i915_drv.c */

void __printf(3, 4)

__i915_printk(struct drm_i915_private *dev_priv, const char *level,

	      const char *fmt, ...);
@@ -2911,16 +2908,6 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, 
#define i915_report_error(dev_priv, fmt, ...)				   \

	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent,

			    struct drm_driver *driver);

extern int i915_driver_unload(struct drm_device *);

extern int i915_driver_open(struct drm_device *dev, struct drm_file *file);

extern void i915_driver_lastclose(struct drm_device * dev);

extern void i915_driver_preclose(struct drm_device *dev,

				 struct drm_file *file);

extern void i915_driver_postclose(struct drm_device *dev,

				  struct drm_file *file);

#ifdef CONFIG_COMPAT

extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);
@@ -3751,7 +3738,6 @@ extern void intel_init_pch_refclk(struct drm_device *dev); 
extern void intel_set_rps(struct drm_i915_private *dev_priv, u8 val);

extern void intel_set_memory_cxsr(struct drm_i915_private *dev_priv,

				  bool enable);

extern void intel_detect_pch(struct drm_device *dev);



extern bool i915_semaphore_is_enabled(struct drm_i915_private *dev_priv);

int i915_reg_read_ioctl(struct drm_device *dev, void *data,