UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: extract i915_perf.h from i915_drv.h 

It used to be handy that we only had a couple of headers, but over time
i915_drv.h has become unwieldy. Extract declarations to a separate
header file corresponding to the implementation module, clarifying the
modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further
includes, using forward declarations as needed. Include the new header
only where needed, and sort the modified include directives while at it
and as needed.

No functional changes.

Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d7826e365695f691a3ac69a69ff6f2bbdb62700d.1565271681.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2019-08-08 16:42:44 +03:00
parent 358c855cb6
commit db94e9f133
5 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/i915/gt/intel_lrc.c
View File

@ -136,6 +136,7 @@
#include "gem/i915_gem_context.h"
#include "i915_drv.h"
#include "i915_perf.h"
#include "i915_trace.h"
#include "i915_vgpu.h"
#include "intel_engine_pm.h"

1
drivers/gpu/drm/i915/i915_drv.c
View File

@ -68,6 +68,7 @@
#include "i915_debugfs.h"
#include "i915_drv.h"
#include "i915_irq.h"
#include "i915_perf.h"
#include "i915_query.h"
#include "i915_trace.h"
#include "i915_vgpu.h"

16
drivers/gpu/drm/i915/i915_drv.h
View File

@ -2418,16 +2418,6 @@ i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id)
return ctx;
}
int i915_perf_open_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
void i915_oa_init_reg_state(struct intel_engine_cs *engine,
struct intel_context *ce,
u32 *reg_state);
/* i915_gem_evict.c */
int __must_check i915_gem_evict_something(struct i915_address_space *vm,
u64 min_size, u64 alignment,
@ -2509,12 +2499,6 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine,
u32 batch_len,
bool is_master);
/* i915_perf.c */
void i915_perf_init(struct drm_i915_private *dev_priv);
void i915_perf_fini(struct drm_i915_private *dev_priv);
void i915_perf_register(struct drm_i915_private *dev_priv);
void i915_perf_unregister(struct drm_i915_private *dev_priv);
/* i915_suspend.c */
int i915_save_state(struct drm_i915_private *dev_priv);
int i915_restore_state(struct drm_i915_private *dev_priv);

1
drivers/gpu/drm/i915/i915_perf.c
View File

@ -200,6 +200,7 @@
#include "gt/intel_lrc_reg.h"
#include "i915_drv.h"
#include "i915_perf.h"
#include "oa/i915_oa_hsw.h"
#include "oa/i915_oa_bdw.h"
#include "oa/i915_oa_chv.h"

32
drivers/gpu/drm/i915/i915_perf.h Normal file
View File

@ -0,0 +1,32 @@
/* SPDX-License-Identifier: MIT */
/*
* Copyright © 2019 Intel Corporation
*/
#ifndef __I915_PERF_H__
#define __I915_PERF_H__
#include <linux/types.h>
struct drm_device;
struct drm_file;
struct drm_i915_private;
struct intel_context;
struct intel_engine_cs;
void i915_perf_init(struct drm_i915_private *i915);
void i915_perf_fini(struct drm_i915_private *i915);
void i915_perf_register(struct drm_i915_private *i915);
void i915_perf_unregister(struct drm_i915_private *i915);
int i915_perf_open_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
struct drm_file *file);
void i915_oa_init_reg_state(struct intel_engine_cs *engine,
struct intel_context *ce,
u32 *reg_state);
#endif /* __I915_PERF_H__ */