From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Andreas Reis <andreas.reis@gmail.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Emil Renner Berthing <kernel@esmil.dk>
Subject: Re: [PATCH] drm/i915: Add primary plane to mask if it's visible
Date: Wed, 23 Sep 2015 11:49:02 +0200 [thread overview]
Message-ID: <20150923094902.GI3383@phenom.ffwll.local> (raw)
In-Reply-To: <55F80F06.8040401@linux.intel.com>
On Tue, Sep 15, 2015 at 02:28:54PM +0200, Maarten Lankhorst wrote:
> This fixes the warnings like
>
> "plane A assertion failure, should be disabled but not"
>
> that on the initial modeset during boot. This can happen if
> the primary plane is enabled by the firmware, but inheriting
> it fails because the DMAR is active or for other reasons.
>
> Reported-By: Andreas Reis <andreas.reis@gmail.com>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91429
> Reported-and-Tested-by: Emil Renner Berthing <kernel@esmil.dk>
Tested-by: Andreas Reis <andreas.reis@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Most likely caused by
commit 36750f284b3a4f19b304fda1bb7d6e9e1275ea8d
Author: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Date: Mon Jun 1 12:49:54 2015 +0200
drm/i915: update plane state during init
which is in 4.3, so this of for Jani.
-Daniel
> ---
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index ca9278be49f7..05c57e6a0e43 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15087,9 +15087,12 @@ static void readout_plane_state(struct intel_crtc *crtc,
>
> plane_state = to_intel_plane_state(p->base.state);
>
> - if (p->base.type == DRM_PLANE_TYPE_PRIMARY)
> + if (p->base.type == DRM_PLANE_TYPE_PRIMARY) {
> plane_state->visible = primary_get_hw_state(crtc);
> - else {
> + if (plane_state->visible)
> + crtc->base.state->plane_mask |=
> + 1 << drm_plane_index(&p->base);
> + } else {
> if (active)
> p->disable_plane(&p->base, &crtc->base);
>
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2015-09-23 9:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 12:28 [PATCH] drm/i915: Add primary plane to mask if it's visible Maarten Lankhorst
2015-09-23 9:49 ` Daniel Vetter [this message]
2015-09-23 10:29 ` Jani Nikula
2015-09-23 11:09 ` Maarten Lankhorst
2015-09-23 12:19 ` Jani Nikula
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=20150923094902.GI3383@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=andreas.reis@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=kernel@esmil.dk \
--cc=maarten.lankhorst@linux.intel.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