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

Commit e87a005d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: add helpers for platform specific revision id range checks 



Revision checks are almost always accompanied by a platform check. (The
exceptions are platform specific code.) Add helpers to check for a
platform and a revision range: IS_SKL_REVID() and IS_BXT_REVID(). In
most places this simplifies and clarifies the code. It will be obvious
that revid macros are used for the correct platform.

This should make it easier to find all the revision checks for
workarounds for each platform, and make it easier to remove them once we
drop support for early hardware revisions.

This should also make it easier to differentiate between Skylake and
Kabylake revision checks when Kabylake support is added.

v2: rebase

Acked-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1445343722-3312-3-git-send-email-jani.nikula@intel.com
parent fffda3f4

drivers/gpu/drm/i915/i915_drv.h

+13 −0
Original line number Diff line number Diff line
@@ -2433,6 +2433,15 @@ struct drm_i915_cmd_table { 
#define INTEL_DEVID(p)	(INTEL_INFO(p)->device_id)

#define INTEL_REVID(p)	(__I915__(p)->dev->pdev->revision)



#define REVID_FOREVER		0xff

/*

 * Return true if revision is in range [since,until] inclusive.

 *

 * Use 0 for open-ended since, and REVID_FOREVER for open-ended until.

 */

#define IS_REVID(p, since, until) \

	(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))



#define IS_I830(dev)		(INTEL_DEVID(dev) == 0x3577)

#define IS_845G(dev)		(INTEL_DEVID(dev) == 0x2562)

#define IS_I85X(dev)		(INTEL_INFO(dev)->is_i85x)
@@ -2501,11 +2510,15 @@ struct drm_i915_cmd_table { 
#define SKL_REVID_E0		0x4

#define SKL_REVID_F0		0x5



#define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))



#define BXT_REVID_A0		0x0

#define BXT_REVID_A1		0x1

#define BXT_REVID_B0		0x3

#define BXT_REVID_C0		0x9



#define IS_BXT_REVID(p, since, until) (IS_BROXTON(p) && IS_REVID(p, since, until))



/*

 * The genX designation typically refers to the render engine, so render

 * capability related checks should use IS_GEN, while display and other checks

drivers/gpu/drm/i915/i915_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -3826,7 +3826,7 @@ int i915_gem_set_caching_ioctl(struct drm_device *dev, void *data, 
		 * cacheline, whereas normally such cachelines would get

		 * invalidated.

		 */

		if (IS_BROXTON(dev) && INTEL_REVID(dev) <= BXT_REVID_A1)

		if (IS_BXT_REVID(dev, 0, BXT_REVID_A1))

			return -ENODEV;



		level = I915_CACHE_LLC;

drivers/gpu/drm/i915/i915_guc_submission.c

+3 −3
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ static int host2guc_sample_forcewake(struct intel_guc *guc, 
	data[0] = HOST2GUC_ACTION_SAMPLE_FORCEWAKE;

	/* WaRsDisableCoarsePowerGating:skl,bxt */

	if (!intel_enable_rc6(dev_priv->dev) ||

	    (IS_BROXTON(dev) && (INTEL_REVID(dev) <= BXT_REVID_A1)) ||

	    (IS_SKL_GT3(dev) && (INTEL_REVID(dev) <= SKL_REVID_E0)) ||

	    (IS_SKL_GT4(dev) && (INTEL_REVID(dev) <= SKL_REVID_E0)))

	    IS_BXT_REVID(dev, 0, BXT_REVID_A1) ||

	    (IS_SKL_GT3(dev) && IS_SKL_REVID(dev, 0, SKL_REVID_E0)) ||

	    (IS_SKL_GT4(dev) && IS_SKL_REVID(dev, 0, SKL_REVID_E0)))

		data[1] = 0;

	else

		/* bit 0 and 1 are for Render and Media domain separately */

drivers/gpu/drm/i915/intel_ddi.c

+1 −2
Original line number Diff line number Diff line
@@ -3247,8 +3247,7 @@ void intel_ddi_init(struct drm_device *dev, enum port port) 
		 * On BXT A0/A1, sw needs to activate DDIA HPD logic and

		 * interrupts to check the external panel connection.

		 */

		if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <= BXT_REVID_A1)

					 && port == PORT_B)

		if (IS_BXT_REVID(dev, 0, BXT_REVID_A1) && port == PORT_B)

			dev_priv->hotplug.irq_port[PORT_A] = intel_dig_port;

		else

			dev_priv->hotplug.irq_port[port] = intel_dig_port;

drivers/gpu/drm/i915/intel_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ intel_dp_sink_rates(struct intel_dp *intel_dp, const int **sink_rates) 
static bool intel_dp_source_supports_hbr2(struct drm_device *dev)

{

	/* WaDisableHBR2:skl */

	if (IS_SKYLAKE(dev) && INTEL_REVID(dev) <= SKL_REVID_B0)

	if (IS_SKL_REVID(dev, 0, SKL_REVID_B0))

		return false;



	if ((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) || IS_BROADWELL(dev) ||
@@ -6087,7 +6087,7 @@ intel_dp_init_connector(struct intel_digital_port *intel_dig_port, 
		break;

	case PORT_B:

		intel_encoder->hpd_pin = HPD_PORT_B;

		if (IS_BROXTON(dev_priv) && (INTEL_REVID(dev) <= BXT_REVID_A1))

		if (IS_BXT_REVID(dev, 0, BXT_REVID_A1))

			intel_encoder->hpd_pin = HPD_PORT_A;

		break;

	case PORT_C: