From patchwork Thu Sep 10 13:25:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timo Aaltonen X-Patchwork-Id: 516265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 9AE2B140549; Thu, 10 Sep 2015 23:25:15 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Za1qg-0004jR-BU; Thu, 10 Sep 2015 13:25:10 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Za1qa-0004jK-O2 for kernel-team@lists.ubuntu.com; Thu, 10 Sep 2015 13:25:04 +0000 Received: from mobile-user-c1d2e3-140.dhcp.inet.fi ([193.210.227.140] helo=eldon.tyrell) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1Za1qa-0005zW-Kv; Thu, 10 Sep 2015 13:25:04 +0000 Message-ID: <55F184AF.8080305@ubuntu.com> Date: Thu, 10 Sep 2015 16:25:03 +0300 From: Timo Aaltonen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Tim Gardner Subject: Re: NAK: [PULL][Wily] drm/i915: Skylake fixes & enablement References: <55F1542B.4040302@ubuntu.com> <55F17E65.3010605@canonical.com> <55F18360.2090701@canonical.com> In-Reply-To: <55F18360.2090701@canonical.com> Cc: Ubuntu Kernel Team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com On 10.09.2015 16:19, Tim Gardner wrote: > On 09/10/2015 06:58 AM, Tim Gardner wrote: >> On 09/10/2015 03:58 AM, Timo Aaltonen wrote: >>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl >> >> None of these commits appear to have come from Linus' repo. >> > > Or perhaps my use of 'git describe' is hosed. Lemme recheck. Yeah, checked them again and they're in Linus' master since last Friday. One additional commit to fix a warning (not on the branch): buglink http://bugs.launchpad.net/bugs/1494163 commit c30400fcffb70d17bbf33eaff5020b83111bd66c Author: Paulo Zanoni Date: Fri Jul 3 12:31:30 2015 -0300 drm/i915: set FDI translations to NULL on SKL drivers/gpu/drm/i915/intel_ddi.c: In function ‘intel_prepare_ddi’: drivers/gpu/drm/i915/intel_ddi.c:517:6: warning: ‘ddi_translations_fdi’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (ddi_translations_fdi) ^ drivers/gpu/drm/i915/intel_ddi.c:446:30: note: ‘ddi_translations_fdi’ was declared here const struct ddi_buf_trans *ddi_translations_fdi; ^ This line used to be there, but was removed by: commit f8896f5d58e64bfd3c2b5f7c5ba5c3f3967e93c7 Author: David Weinehall Date: Thu Jun 25 11:11:03 2015 +030 drm/i915/skl: Buffer translation improvements Cc: David Weinehall Signed-off-by: Paulo Zanoni Signed-off-by: Daniel Vetter diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c index db22f01..9a40bfb 100644 --- a/drivers/gpu/drm/i915/intel_ddi.c +++ b/drivers/gpu/drm/i915/intel_ddi.c @@ -458,6 +458,7 @@ static void intel_prepare_ddi_buffers(struct drm_device *dev, enum port port, INTEL_OUTPUT_HDMI); return; } else if (IS_SKYLAKE(dev)) { + ddi_translations_fdi = NULL; ddi_translations_dp = skl_get_buf_trans_dp(dev, &n_dp_entries); ddi_translations_edp =