Commit 3ed131e5 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Lucas De Marchi
Browse files

drm/i915/dmc: Move struct intel_dmc to intel_dmc.h 



Move struct intel_dmc from i915_drv.h to intel_dmc.h.

v2: Add includes along with moving the struct.

Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210526220256.4097-4-anusha.srivatsa@intel.com
parent 03256487

drivers/gpu/drm/i915/display/intel_dmc.h

+21 −0
Original line number Diff line number Diff line
@@ -6,12 +6,33 @@ 
#ifndef __INTEL_DMC_H__

#define __INTEL_DMC_H__



#include "i915_reg.h"

#include "intel_wakeref.h"

#include <linux/workqueue.h>



struct drm_i915_private;



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

#define DMC_VERSION_MAJOR(version)	((version) >> 16)

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



struct intel_dmc {

	struct work_struct work;

	const char *fw_path;

	u32 required_version;

	u32 max_fw_size; /* bytes */

	u32 *dmc_payload;

	u32 dmc_fw_size; /* dwords */

	u32 version;

	u32 mmio_count;

	i915_reg_t mmioaddr[20];

	u32 mmiodata[20];

	u32 dc_state;

	u32 target_dc_state;

	u32 allowed_dc_mask;

	intel_wakeref_t wakeref;

};



void intel_dmc_ucode_init(struct drm_i915_private *i915);

void intel_dmc_load_program(struct drm_i915_private *i915);

void intel_dmc_ucode_fini(struct drm_i915_private *i915);

drivers/gpu/drm/i915/i915_drv.h

+1 −17
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include "display/intel_bios.h"

#include "display/intel_display.h"

#include "display/intel_display_power.h"

#include "display/intel_dmc.h"

#include "display/intel_dpll_mgr.h"

#include "display/intel_dsb.h"

#include "display/intel_frontbuffer.h"
@@ -328,23 +329,6 @@ struct drm_i915_display_funcs { 
	void (*read_luts)(struct intel_crtc_state *crtc_state);

};



struct intel_dmc {

	struct work_struct work;

	const char *fw_path;

	u32 required_version;

	u32 max_fw_size; /* bytes */

	u32 *dmc_payload;

	u32 dmc_fw_size; /* dwords */

	u32 version;

	u32 mmio_count;

	i915_reg_t mmioaddr[20];

	u32 mmiodata[20];

	u32 dc_state;

	u32 target_dc_state;

	u32 allowed_dc_mask;

	intel_wakeref_t wakeref;

};



enum i915_cache_level {

	I915_CACHE_NONE = 0,

	I915_CACHE_LLC, /* also used for snoopable memory on non-LLC */