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

Commit 6176490e authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/csr: move CSR version macros to intel_csr.h 



Reduce clutter from i915_drv.h.

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/8222df3f559b056387b5c7e6e04a878cbf8b4e2e.1556809195.git.jani.nikula@intel.com
parent d28cea20

drivers/gpu/drm/i915/i915_debugfs.c

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


#include "i915_gem_context.h"

#include "i915_irq.h"

#include "intel_csr.h"

#include "intel_dp.h"

#include "intel_drv.h"

#include "intel_fbc.h"

drivers/gpu/drm/i915/i915_drv.h

+0 −4
Original line number Diff line number Diff line
@@ -345,10 +345,6 @@ struct drm_i915_display_funcs { 
	void (*load_luts)(const struct intel_crtc_state *crtc_state);

};



#define CSR_VERSION(major, minor)	((major) << 16 | (minor))

#define CSR_VERSION_MAJOR(version)	((version) >> 16)

#define CSR_VERSION_MINOR(version)	((version) & 0xffff)



struct intel_csr {

	struct work_struct work;

	const char *fw_path;

drivers/gpu/drm/i915/i915_gpu_error.c

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

#include "i915_gpu_error.h"

#include "intel_atomic.h"

#include "intel_csr.h"

#include "intel_overlay.h"



static inline const struct intel_engine_cs *

drivers/gpu/drm/i915/intel_csr.h

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ 


struct drm_i915_private;



#define CSR_VERSION(major, minor)	((major) << 16 | (minor))

#define CSR_VERSION_MAJOR(version)	((version) >> 16)

#define CSR_VERSION_MINOR(version)	((version) & 0xffff)



void intel_csr_ucode_init(struct drm_i915_private *i915);

void intel_csr_load_program(struct drm_i915_private *i915);

void intel_csr_ucode_fini(struct drm_i915_private *i915);