Commit a8454813 authored by Uma Shankar's avatar Uma Shankar
Browse files

drm/i915: Remove i915_reg.h from i9xx_wm.c 



Move FW_BLC_SELF to common header to make i9xx_wm.c
free from i915_reg.h include. Introduce a common
intel_gmd_misc_regs.h to define common miscellaneous
register definitions across graphics and display.

v3: MISC header included as needed, drop from i915_reg (Jani)

v2: Introdue a common misc header for GMD

Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260205094341.1882816-13-uma.shankar@intel.com
parent 5504f1ac

drivers/gpu/drm/i915/display/i9xx_wm.c

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#include <linux/iopoll.h>



#include <drm/drm_print.h>

#include <drm/intel/intel_gmd_misc_regs.h>



#include "i915_reg.h"

#include "i9xx_wm.h"

#include "i9xx_wm_regs.h"

#include "intel_atomic.h"

drivers/gpu/drm/i915/display/intel_display_debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <drm/drm_file.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_print.h>

#include <drm/intel/intel_gmd_misc_regs.h>



#include "hsw_ips.h"

#include "i915_reg.h"

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

+6 −1
Original line number Diff line number Diff line
@@ -3132,6 +3132,11 @@ enum skl_power_gate { 
#define   MTL_TRAS_MASK			REG_GENMASK(16, 8)

#define   MTL_TRDPRE_MASK		REG_GENMASK(7, 0)





#define FW_BLC		_MMIO(0x20d8)

#define FW_BLC2		_MMIO(0x20dc)

#define FW_BLC_SELF	_MMIO(0x20e0) /* 915+ only */

#define   FW_BLC_SELF_EN_MASK      REG_BIT(31)

#define   FW_BLC_SELF_FIFO_MASK    REG_BIT(16) /* 945 only */

#define   FW_BLC_SELF_EN           REG_BIT(15) /* 945 only */



#endif /* __INTEL_DISPLAY_REGS_H__ */

drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/highmem.h>



#include <drm/drm_print.h>

#include <drm/intel/intel_gmd_misc_regs.h>



#include "display/intel_display.h"

#include "i915_drv.h"

drivers/gpu/drm/i915/gt/intel_ring_submission.c

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


#include <drm/drm_cache.h>

#include <drm/intel/intel_gmd_interrupt_regs.h>

#include <drm/intel/intel_gmd_misc_regs.h>



#include "gem/i915_gem_internal.h"