mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: "Radek Dostál" <rd@radekdostal.com>
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
Date: Mon, 20 Apr 2015 11:48:52 +0100	[thread overview]
Message-ID: <20150420104852.GF25451@nuc-i3427.alporthouse.com> (raw)
In-Reply-To: <5534D721.1060206@radekdostal.com>

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

  reply	other threads:[~2015-04-20 10:49 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-19 21:05 [PATCH] " Radek Dostal
2015-04-20  5:26 ` [PATCHv2] " Radek Dostal
2015-04-20  9:09   ` Chris Wilson
2015-04-20  9:36     ` Radek Dostál
2015-04-20  9:46       ` Chris Wilson
2015-04-20  9:58         ` Chris Wilson
2015-04-20 10:38           ` Radek Dostál
2015-04-20 10:48             ` Chris Wilson [this message]
2015-04-20 10:57               ` Radek Dostál
2015-04-20 11:00                 ` Chris Wilson
2015-04-20 11:20                   ` Radek Dostál
2015-04-20 11:44                     ` Chris Wilson
2015-04-20 12:00                       ` Radek Dostál

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150420104852.GF25451@nuc-i3427.alporthouse.com \
    --to=chris@chris-wilson.co.uk \
    --cc=airlied@linux.ie \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rd@radekdostal.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®