From patchwork Fri Jun 19 15:24:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 6645711 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A11C7C0433 for ; Fri, 19 Jun 2015 15:21:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B37AF20958 for ; Fri, 19 Jun 2015 15:21:49 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 900082094B for ; Fri, 19 Jun 2015 15:21:47 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8F9B46E683; Fri, 19 Jun 2015 08:21:46 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id 9352E6E683 for ; Fri, 19 Jun 2015 08:21:45 -0700 (PDT) Received: by wguu7 with SMTP id u7so20251823wgu.3 for ; Fri, 19 Jun 2015 08:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=lD+eqNE5zn3l4qEN4XtV+ljhmxJwQ6CR8AQWYN2zcxE=; b=alhgqGMw2OJLm/Ovg49t5/lD5lNo/N4siKiz/socpEzEb89X52CC9su+bV5yuq3FSd qZDMVh25I3Bq/W8hqrMuyAuggVai++b4Rb60CJ+8xRQTmLkLPxVeKbmJtM6OpS1FJudM 1E+YhcTi7eK3kOJRgtQSb18xqvcG5SBoqkvNY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-type:content-disposition :content-transfer-encoding:in-reply-to:user-agent; bh=lD+eqNE5zn3l4qEN4XtV+ljhmxJwQ6CR8AQWYN2zcxE=; b=OaTZaHwml8IP9RooYo+cWm0L7GHmDFGK3r04n/m3+hyEtCYoeIkzo/wcs7Yz4sC+WD dN8G0qL/U6xRgBvQ+ipNikJ0q/1ipeI+AdC/9ES8uCgSVAAGvcuafqOipvYK/qRFHo+c NwGs9tp24T/5L6V1uGpc9BnEjCv7Yhg1/XorxzOWOcrmMKIDSBIsxW5JgCa2/LF7QHyJ 47q514REQIvwCZt//1IA1HB5I9Y7tVNZ8E/+qPcGtLczAIsvVXD4EUm4a9yJ+FCMENFV AC5L1BucqxKnF8yKa4scPOKX29DkBDspaDrBldCEEizgmufCydQ8IZijiQKVMF9/fYcR fPEg== X-Gm-Message-State: ALoCoQlr/pRMcjPE4br0QiWG6mBTsSSQHGbBpion4MzpT4tY27aV5vn2+UJyDl4qgmmstdXiO32J X-Received: by 10.180.95.10 with SMTP id dg10mr7746815wib.41.1434727304752; Fri, 19 Jun 2015 08:21:44 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:22cf:30ff:fe4c:37d6]) by mx.google.com with ESMTPSA id ul1sm17496388wjc.30.2015.06.19.08.21.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jun 2015 08:21:43 -0700 (PDT) Date: Fri, 19 Jun 2015 17:24:26 +0200 From: Daniel Vetter To: Dave Airlie Subject: Re: [PULL] drm-intel-next-fixes Message-ID: <20150619152426.GA25769@phenom.ffwll.local> References: <87r3p9imbb.fsf@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 4.0.0-rc3+ User-Agent: Mutt/1.5.23 (2014-03-12) Cc: Jani Nikula , Daniel Vetter , "intel-gfx@lists.freedesktop.org" , dri-devel X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Fri, Jun 19, 2015 at 01:48:13PM +1000, Dave Airlie wrote: > On 18 June 2015 at 16:04, Jani Nikula wrote: > > > > Hi Dave, i915 fixes for drm-next/v4.2. > > > > BR, > > Jani. > > And my gcc says: > > /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c: > In function ‘__intel_set_mode’: > /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:11850:14: > warning: ‘crtc_state’ may be used uninitialized in this function > [-Wmaybe-uninitialized] > return state->mode_changed || state->active_changed; > ^ > /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:11860:25: > note: ‘crtc_state’ was declared here > struct drm_crtc_state *crtc_state; > ^ > /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:11874:6: > warning: ‘crtc’ may be used uninitialized in this function > [-Wmaybe-uninitialized] > if (crtc != intel_encoder->base.crtc) > ^ > /home/airlied/devel/kernel/drm-next/drivers/gpu/drm/i915/intel_display.c:11859:19: > note: ‘crtc’ was declared here > struct drm_crtc *crtc; > ^ > > No idea if this is true, but I don't think I've seen it before now. > > gcc 5.1.1 on fedora 22 Yeah this is new with Ander's patches. gcc Doesn't know that we have at least 1 crtc and hence crtc&crtc are guaranteed to be initiliazed. I think you should be able to shut it up with But the entire Finland team is out of office (celebrating solstice), so might be better to wait for Monday for them to confirm. Otherwise just apply this fixup with my ack if you want to send out the merge window pull asap. Cheers, Daniel diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index e047105837c9..5ade250dc6d7 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11856,8 +11856,8 @@ intel_modeset_update_state(struct drm_atomic_state *state) struct drm_device *dev = state->dev; struct drm_i915_private *dev_priv = dev->dev_private; struct intel_encoder *intel_encoder; - struct drm_crtc *crtc; - struct drm_crtc_state *crtc_state; + struct drm_crtc *crtc = NULL; + struct drm_crtc_state *crtc_state = NULL; struct drm_connector *connector; int i;