Commit 58471f63 authored by Jani Nikula's avatar Jani Nikula

drm/i915/driver: rename i915_drv.c to i915_driver.c

This is more about trimming i915_drv.h than the renamed
i915_driver.[ch]. Split out i915_driver.[ch] out of i915_drv.h as a
feasible thing to do.
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211111101304.13094-1-jani.nikula@intel.com
parent 1a085e23
...@@ -30,7 +30,7 @@ subdir-ccflags-y += -I$(srctree)/$(src) ...@@ -30,7 +30,7 @@ subdir-ccflags-y += -I$(srctree)/$(src)
# Please keep these build lists sorted! # Please keep these build lists sorted!
# core driver code # core driver code
i915-y += i915_drv.o \ i915-y += i915_driver.o \
i915_config.o \ i915_config.o \
i915_irq.o \ i915_irq.o \
i915_getparam.o \ i915_getparam.o \
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/oom.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/oom.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
...@@ -48,8 +48,8 @@ ...@@ -48,8 +48,8 @@
#include "display/intel_acpi.h" #include "display/intel_acpi.h"
#include "display/intel_bw.h" #include "display/intel_bw.h"
#include "display/intel_cdclk.h" #include "display/intel_cdclk.h"
#include "display/intel_dmc.h"
#include "display/intel_display_types.h" #include "display/intel_display_types.h"
#include "display/intel_dmc.h"
#include "display/intel_dp.h" #include "display/intel_dp.h"
#include "display/intel_dpt.h" #include "display/intel_dpt.h"
#include "display/intel_fbdev.h" #include "display/intel_fbdev.h"
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#include "pxp/intel_pxp_pm.h" #include "pxp/intel_pxp_pm.h"
#include "i915_debugfs.h" #include "i915_debugfs.h"
#include "i915_driver.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_ioc32.h" #include "i915_ioc32.h"
#include "i915_irq.h" #include "i915_irq.h"
......
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2019 Intel Corporation
*/
#ifndef __I915_DRIVER_H__
#define __I915_DRIVER_H__
#include <linux/pm.h>
struct pci_dev;
struct pci_device_id;
struct drm_i915_private;
extern const struct dev_pm_ops i915_pm_ops;
int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
void i915_driver_remove(struct drm_i915_private *i915);
void i915_driver_shutdown(struct drm_i915_private *i915);
int i915_resume_switcheroo(struct drm_i915_private *i915);
int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
#endif /* __I915_DRIVER_H__ */
...@@ -1785,16 +1785,7 @@ intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915) ...@@ -1785,16 +1785,7 @@ intel_vm_no_concurrent_access_wa(struct drm_i915_private *i915)
return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915); return IS_CHERRYVIEW(i915) || intel_ggtt_update_needs_vtd_wa(i915);
} }
/* i915_drv.c */ /* i915_getparam.c */
extern const struct dev_pm_ops i915_pm_ops;
int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
void i915_driver_remove(struct drm_i915_private *i915);
void i915_driver_shutdown(struct drm_i915_private *i915);
int i915_resume_switcheroo(struct drm_i915_private *i915);
int i915_suspend_switcheroo(struct drm_i915_private *i915, pm_message_t state);
int i915_getparam_ioctl(struct drm_device *dev, void *data, int i915_getparam_ioctl(struct drm_device *dev, void *data,
struct drm_file *file_priv); struct drm_file *file_priv);
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <drm/drm_drv.h> #include <drm/drm_drv.h>
#include <drm/i915_pciids.h> #include <drm/i915_pciids.h>
#include "i915_driver.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_pci.h" #include "i915_pci.h"
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <linux/vga_switcheroo.h> #include <linux/vga_switcheroo.h>
#include "i915_driver.h"
#include "i915_drv.h" #include "i915_drv.h"
#include "i915_switcheroo.h" #include "i915_switcheroo.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment