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

Commit 9bbfd20a authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Jani Nikula
Browse files

drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX 



Because the docs say ULX doesn't support it on HSW.

Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent cfa7c862

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -1954,6 +1954,9 @@ struct drm_i915_cmd_table { 
#define IS_ULT(dev)		(IS_HSW_ULT(dev) || IS_BDW_ULT(dev))

#define IS_HSW_GT3(dev)		(IS_HASWELL(dev) && \

				 ((dev)->pdev->device & 0x00F0) == 0x0020)

/* ULX machines are also considered ULT. */

#define IS_HSW_ULX(dev)		((dev)->pdev->device == 0x0A0E || \

				 (dev)->pdev->device == 0x0A1E)

#define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary)



/*

drivers/gpu/drm/i915/intel_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ intel_dp_max_link_bw(struct intel_dp *intel_dp) 
	case DP_LINK_BW_2_7:

		break;

	case DP_LINK_BW_5_4: /* 1.2 capable displays may advertise higher bw */

		if ((IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8) &&

		if (((IS_HASWELL(dev) && !IS_HSW_ULX(dev)) ||

		     INTEL_INFO(dev)->gen >= 8) &&

		    intel_dp->dpcd[DP_DPCD_REV] >= 0x12)

			max_link_bw = DP_LINK_BW_5_4;

		else

include/drm/i915_pciids.h

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ 
	INTEL_VGA_DEVICE(0x0A06, info), /* ULT GT1 mobile */ \

	INTEL_VGA_DEVICE(0x0A16, info), /* ULT GT2 mobile */ \

	INTEL_VGA_DEVICE(0x0A26, info), /* ULT GT3 mobile */ \

	INTEL_VGA_DEVICE(0x0A0E, info), /* ULT GT1 reserved */ \

	INTEL_VGA_DEVICE(0x0A1E, info), /* ULT GT2 reserved */ \

	INTEL_VGA_DEVICE(0x0A0E, info), /* ULX GT1 mobile */ \

	INTEL_VGA_DEVICE(0x0A1E, info), /* ULX GT2 mobile */ \

	INTEL_VGA_DEVICE(0x0A2E, info), /* ULT GT3 reserved */ \

	INTEL_VGA_DEVICE(0x0D06, info), /* CRW GT1 mobile */ \

	INTEL_VGA_DEVICE(0x0D16, info), /* CRW GT2 mobile */ \