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

Commit e76ebff8 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Introduce HAS_FPGA_DBG_UNCLAIMED() 



Let's introduce one more of those orthogonal feature macros. This should
hopefully make the code more readable and make things easier for new platform
enabling.

This time, HAS_FPGA_DBG_UNCLAIMED() is true for platforms that have bit
31 of FPGA_DBG able to signal unclaimed writes.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent dd93be58

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1472,7 +1472,7 @@ static void intel_early_sanitize_regs(struct drm_device *dev) 
{

	struct drm_i915_private *dev_priv = dev->dev_private;



	if (IS_HASWELL(dev))

	if (HAS_FPGA_DBG_UNCLAIMED(dev))

		I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM);

}

drivers/gpu/drm/i915/i915_drv.c

+2 −2
Original line number Diff line number Diff line
@@ -1205,7 +1205,7 @@ ilk_dummy_write(struct drm_i915_private *dev_priv) 
static void

hsw_unclaimed_reg_clear(struct drm_i915_private *dev_priv, u32 reg)

{

	if (IS_HASWELL(dev_priv->dev) &&

	if (HAS_FPGA_DBG_UNCLAIMED(dev_priv->dev) &&

	    (I915_READ_NOTRACE(FPGA_DBG) & FPGA_DBG_RM_NOCLAIM)) {

		DRM_ERROR("Unknown unclaimed register before writing to %x\n",

			  reg);
@@ -1216,7 +1216,7 @@ hsw_unclaimed_reg_clear(struct drm_i915_private *dev_priv, u32 reg) 
static void

hsw_unclaimed_reg_check(struct drm_i915_private *dev_priv, u32 reg)

{

	if (IS_HASWELL(dev_priv->dev) &&

	if (HAS_FPGA_DBG_UNCLAIMED(dev_priv->dev) &&

	    (I915_READ_NOTRACE(FPGA_DBG) & FPGA_DBG_RM_NOCLAIM)) {

		DRM_ERROR("Unclaimed write to %x\n", reg);

		I915_WRITE_NOTRACE(FPGA_DBG, FPGA_DBG_RM_NOCLAIM);

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -1370,6 +1370,7 @@ struct drm_i915_file_private { 


#define HAS_DDI(dev)		(INTEL_INFO(dev)->has_ddi)

#define HAS_POWER_WELL(dev)	(IS_HASWELL(dev))

#define HAS_FPGA_DBG_UNCLAIMED(dev)	(IS_HASWELL(dev))



#define INTEL_PCH_DEVICE_ID_MASK		0xff00

#define INTEL_PCH_IBX_DEVICE_ID_TYPE		0x3b00