Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754826AbbDTKtA (ORCPT ); Mon, 20 Apr 2015 06:49:00 -0400 Received: from mail.fireflyinternet.com ([87.106.93.118]:57766 "EHLO fireflyinternet.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754524AbbDTKs6 (ORCPT ); Mon, 20 Apr 2015 06:48:58 -0400 X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Date: Mon, 20 Apr 2015 11:48:52 +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: <20150420104852.GF25451@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: <1429477553-10294-1-git-send-email-rd@radekdostal.com> <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> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <5534D721.1060206@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: 2613 Lines: 74 On Mon, Apr 20, 2015 at 12:38:25PM +0200, Radek Dost?l wrote: > Hi Chris, > > On 04/20/2015 11:58 AM, Chris Wilson wrote: > > Hmm, so that should be before the clock comparison as well to fix your > > example. Not as neat. > > indeed that is required. > > > The other idea I was considering was not adding the GTF cmdline mode if > > the probed modes already contain one of a matching resolution. The goal > > here is to also not present a mode to userspace that is invalid. > > Unfortunately you can not do that. I already tried. At the time when > drm_helper_probe_add_cmdline_mode is called EDID informations are not > yet available. My understanding is that it should be. fb_helper.initial_config does a probe first, and the intel_fb_initial_config() should only keep the active mode. > Only option would be to remove the GTF cmdline mode, when matching mode > is found in EDID. So basically diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c index 6350387..9212bec 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -79,13 +79,29 @@ drm_mode_validate_flag(const struct drm_display_mode *mode, static int drm_helper_probe_add_cmdline_mode(struct drm_connector *connector) { + struct drm_cmdline_mode *cmdline_mode; struct drm_display_mode *mode; - if (!connector->cmdline_mode.specified) + cmdline_mode = &connector->cmdline_mode; + if (!cmdline_mode->specified) return 0; + /* Only add a GTF mode if we find no matching probed modes */ + list_for_each_entry(mode, &connector->modes, head) { + if (mode->hdisplay != cmdline_mode->xres || + mode->vdisplay != cmdline_mode->yres) + continue; + + if (cmdline_mode->refresh_specified) { + if (mode->vrefresh != cmdline_mode->refresh) + continue; + } + + return 0; + } + mode = drm_mode_create_from_cmdline_mode(connector->dev, - &connector->cmdline_mode); + cmdline_mode); if (mode == NULL) return 0; is not sufficient? -Chris -- 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/