From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: don't try DP_LINK_BW_5_4 on HSW ULX Date: Wed, 30 Apr 2014 09:55:00 +0300 Message-ID: <87d2fztigr.fsf@intel.com> References: <1398780022-20667-1-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C95DB6E135 for ; Tue, 29 Apr 2014 23:55:03 -0700 (PDT) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dave Airlie , Paulo Zanoni Cc: "intel-gfx@lists.freedesktop.org" , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Wed, 30 Apr 2014, Dave Airlie wrote: > On 30 April 2014 00:00, Paulo Zanoni wrote: >> From: Paulo Zanoni >> >> Because the docs say ULX doesn't support it on HSW. > > i read the exact same thing, > > Reviewed-by: Dave Airlie Pushed to -fixes, thanks for the patch and review. BR, Jani. > >> >> Signed-off-by: Paulo Zanoni >> --- >> drivers/gpu/drm/i915/i915_drv.h | 3 +++ >> drivers/gpu/drm/i915/intel_dp.c | 3 ++- >> include/drm/i915_pciids.h | 4 ++-- >> 3 files changed, 7 insertions(+), 3 deletions(-) >> >> >> This patch is completely untested!!! >> >> >> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h >> index e81feab..bdc612c 100644 >> --- a/drivers/gpu/drm/i915/i915_drv.h >> +++ b/drivers/gpu/drm/i915/i915_drv.h >> @@ -1816,6 +1816,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) >> >> /* >> diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c >> index 34ed143..87b0a51 100644 >> --- a/drivers/gpu/drm/i915/intel_dp.c >> +++ b/drivers/gpu/drm/i915/intel_dp.c >> @@ -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 >> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h >> index 24f3cad..5cd9165 100644 >> --- a/include/drm/i915_pciids.h >> +++ b/include/drm/i915_pciids.h >> @@ -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 */ \ >> -- >> 1.9.2 >> >> _______________________________________________ >> Intel-gfx mailing list >> Intel-gfx@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/intel-gfx > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center