Commit 9c9082b9 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: extract i915_memcpy.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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f2b887002150acdf218385ea846f7aa617aa5f15.1565271681.git.jani.nikula@intel.com
parent bdd1510c

drivers/gpu/drm/i915/gt/uc/intel_guc_log.c

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include <linux/debugfs.h>



#include "gt/intel_gt.h"

#include "intel_guc_log.h"

#include "i915_drv.h"

#include "i915_memcpy.h"

#include "intel_guc_log.h"



static void guc_log_capture_logs(struct intel_guc_log *log);

drivers/gpu/drm/i915/i915_cmd_parser.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "gt/intel_engine.h"



#include "i915_drv.h"

#include "i915_memcpy.h"



/**

 * DOC: batch buffer command parser

drivers/gpu/drm/i915/i915_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include "i915_debugfs.h"

#include "i915_drv.h"

#include "i915_irq.h"

#include "i915_memcpy.h"

#include "i915_perf.h"

#include "i915_query.h"

#include "i915_suspend.h"

drivers/gpu/drm/i915/i915_drv.h

+0 −19
Original line number Diff line number Diff line
@@ -2546,25 +2546,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data, 
#define I915_READ_FW(reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))

#define I915_WRITE_FW(reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__))



void i915_memcpy_init_early(struct drm_i915_private *dev_priv);

bool i915_memcpy_from_wc(void *dst, const void *src, unsigned long len);



/* The movntdqa instructions used for memcpy-from-wc require 16-byte alignment,

 * as well as SSE4.1 support. i915_memcpy_from_wc() will report if it cannot

 * perform the operation. To check beforehand, pass in the parameters to

 * to i915_can_memcpy_from_wc() - since we only care about the low 4 bits,

 * you only need to pass in the minor offsets, page-aligned pointers are

 * always valid.

 *

 * For just checking for SSE4.1, in the foreknowledge that the future use

 * will be correctly aligned, just use i915_has_memcpy_from_wc().

 */

#define i915_can_memcpy_from_wc(dst, src, len) \

	i915_memcpy_from_wc((void *)((unsigned long)(dst) | (unsigned long)(src) | (len)), NULL, 0)



#define i915_has_memcpy_from_wc() \

	i915_memcpy_from_wc(NULL, NULL, 0)



/* i915_mm.c */

int remap_io_mapping(struct vm_area_struct *vma,

		     unsigned long addr, unsigned long pfn, unsigned long size,

drivers/gpu/drm/i915/i915_gpu_error.c

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


#include "i915_drv.h"

#include "i915_gpu_error.h"

#include "i915_memcpy.h"

#include "i915_scatterlist.h"

#include "intel_csr.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE