Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754868AbbDTLo5 (ORCPT ); Mon, 20 Apr 2015 07:44:57 -0400 Received: from mail.fireflyinternet.com ([87.106.93.118]:61177 "EHLO fireflyinternet.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754734AbbDTLo4 (ORCPT ); Mon, 20 Apr 2015 07:44:56 -0400 X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Date: Mon, 20 Apr 2015 12:44:50 +0100 From: Chris Wilson To: Radek =?iso-8859-1?Q?Dost=E1l?= Cc: airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv2] drm: fb_helper: prefer to use mode, which is not DRM_MODE_TYPE_USERDEF Message-ID: <20150420114450.GH25451@nuc-i3427.alporthouse.com> Mail-Followup-To: Chris Wilson , Radek =?iso-8859-1?Q?Dost=E1l?= , airlied@linux.ie, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <1429507593-21172-1-git-send-email-rd@radekdostal.com> <20150420090929.GC25451@nuc-i3427.alporthouse.com> <5534C884.8080101@radekdostal.com> <20150420094608.GD25451@nuc-i3427.alporthouse.com> <20150420095818.GE25451@nuc-i3427.alporthouse.com> <5534D721.1060206@radekdostal.com> <20150420104852.GF25451@nuc-i3427.alporthouse.com> <5534DB9D.6040109@radekdostal.com> <20150420110049.GG25451@nuc-i3427.alporthouse.com> <5534E0E5.6020101@radekdostal.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5534E0E5.6020101@radekdostal.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1969 Lines: 45 On Mon, Apr 20, 2015 at 01:20:05PM +0200, Radek Dost?l wrote: > Hi Chris, > > On 04/20/2015 01:00 PM, Chris Wilson wrote: > > Can you do a WARN_ON(list_empty(&connector->modes)) here to see at what > > point we set up the invalid GTF mode? > > sure please see attached patch adding WARN_ON and corresponding output > of dmesg. As mentioned in the original commit, the mode is indeed added > in drm_helper_probe_add_cmdline_mode. Ah, maybe this on top of the previous try: diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 88f5a74..5d22ca0 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -87,7 +87,7 @@ static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector) return 0; /* Only add a GTF mode if we find no matching probed modes */ - list_for_each_entry(mode, &connector->modes, head) { + list_for_each_entry(mode, &connector->probed_modes, head) { if (mode->hdisplay != cmdline_mode->xres || mode->vdisplay != cmdline_mode->yres) continue; @@ -211,7 +211,8 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect mode_flags |= DRM_MODE_FLAG_3D_MASK; list_for_each_entry(mode, &connector->modes, head) { - mode->status = drm_mode_validate_basic(mode); + if (mode->status == MODE_OK) + mode->status = drm_mode_validate_basic(mode); if (mode->status == MODE_OK) mode->status = drm_mode_validate_size(mode, maxX, maxY -- Chris Wilson, Intel Open Source Technology Centre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/