From: Daniel Vetter <daniel@ffwll.ch>
To: Dave Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm/fb-helper: don't clobber output routing in setup_crtcs
Date: Wed, 15 Aug 2012 16:20:50 +0200 [thread overview]
Message-ID: <20120815142050.GB5533@phenom.ffwll.local> (raw)
In-Reply-To: <1344788148-1174-1-git-send-email-daniel.vetter@ffwll.ch>
On Sun, Aug 12, 2012 at 06:15:48PM +0200, Daniel Vetter wrote:
> Yet again the too close relationship between the fb helper and the
> crtc helper code strikes. This time around the fb helper resets all
> encoder->crtc pointers to NULL before starting to set up it's own
> mode. Which is total bullocks, because this will clobber the existing
> output routing, which the new drm/i915 code depends upon to be
> absolutely correct.
>
> The crtc helper itself doesn't really care about that, since it
> disables unused encoders in a rather roundabout way anyway.
>
> Two places call drm_setup_crts:
>
> - For the initial fb config. I've auditted all current drivers, and
> they all allocate their encoders with kzalloc. So there's no need to
> clear encoder->crtc once more.
>
> - When processing hotplug events while showing the fb console. This
> one is a bit more tricky, but both the crtc helper code and the new
> drm/i915 modeset code disable encoders if their crtc is changed and
> that encoder isn't part of the new config. Also, both disable any
> disconnected outputs, too.
>
> Which only leaves encoders that are on, connected, but for some odd
> reason the fb helper code doesn't want to use. That would be a bug
> in the fb configuration selector, since it tries to light up as many
> outputs as possible.
>
> v2: Kill the now unused encoders variable.
>
> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> Hi Dave,
>
> This patch here is blocking the modeset-rework series, and I'd like to merge
> that as soon as possible. You've merged the other two prep patches already for
> 3.6, but this one here popped up later on in testing.
>
> Can you please merge this into drm-next for 3.7 so that I can backmerge it, or
> smash your maintainer-ack onto it for merging through the intel tree?
Merged to drm-intel-next with Dave's irc-ack. Should show up in drm-next
in about 2 weeks ...
-Daniel
--
Daniel Vetter
Mail: daniel@ffwll.ch
Mobile: +41 (0)79 365 57 48
next prev parent reply other threads:[~2012-08-15 14:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-12 16:15 [PATCH] drm/fb-helper: don't clobber output routing in setup_crtcs Daniel Vetter
2012-08-15 14:20 ` Daniel Vetter [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-25 20:10 Daniel Vetter
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=20120815142050.GB5533@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=airlied@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/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;
as well as URLs for NNTP newsgroup(s).