From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Dave Airlie <airlied@gmail.com>, Lyude Paul <lyude@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
dri-devel <dri-devel@lists.freedesktop.org>,
Ben Skeggs <bskeggs@redhat.com>
Subject: Re: [git pull] drm next pull for 5.10-rc1
Date: Wed, 4 Nov 2020 01:20:13 +0300 [thread overview]
Message-ID: <20201103222013.hypmzlq7uuqufe76@box> (raw)
In-Reply-To: <CAPM=9txyMmW1DWhS--SuYQu4qDK1GPzgHJwxbAfhHT=hUsPODA@mail.gmail.com>
On Thu, Oct 15, 2020 at 11:33:08AM +1000, Dave Airlie wrote:
> drm/nouveau/kms: Search for encoders' connectors properly
This commit (09838c4efe9a) broke boot for me. These two hunks in
particular:
@ -2066,7 +2120,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
outp->clr.mask, outp->set.mask);
if (outp->clr.mask) {
- help->disable(encoder);
+ help->atomic_disable(encoder, state);
interlock[NV50_DISP_INTERLOCK_CORE] |= 1;
if (outp->flush_disable) {
nv50_disp_atomic_commit_wndw(state, interlock);
@@ -2105,7 +2159,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
outp->set.mask, outp->clr.mask);
if (outp->set.mask) {
- help->enable(encoder);
+ help->atomic_enable(encoder, state);
interlock[NV50_DISP_INTERLOCK_CORE] = 1;
}
I hacked up patch to use help->disable/help->enable if atomic_ versions
are NULL. It worked.
In my setup I stepped onto nv50_msto_help->atomic_enable == NULL. But
there are two more drm_encoder_helper_funcs in dispnv50/disp.c that don't
have atomic_enable/disable set: nv50_dac_help, nv50_pior_help.
--
Kirill A. Shutemov
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: Dave Airlie <airlied@gmail.com>, Lyude Paul <lyude@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
dri-devel <dri-devel@lists.freedesktop.org>,
LKML <linux-kernel@vger.kernel.org>,
Ben Skeggs <bskeggs@redhat.com>
Subject: Re: [git pull] drm next pull for 5.10-rc1
Date: Wed, 4 Nov 2020 01:20:13 +0300 [thread overview]
Message-ID: <20201103222013.hypmzlq7uuqufe76@box> (raw)
In-Reply-To: <CAPM=9txyMmW1DWhS--SuYQu4qDK1GPzgHJwxbAfhHT=hUsPODA@mail.gmail.com>
On Thu, Oct 15, 2020 at 11:33:08AM +1000, Dave Airlie wrote:
> drm/nouveau/kms: Search for encoders' connectors properly
This commit (09838c4efe9a) broke boot for me. These two hunks in
particular:
@ -2066,7 +2120,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
outp->clr.mask, outp->set.mask);
if (outp->clr.mask) {
- help->disable(encoder);
+ help->atomic_disable(encoder, state);
interlock[NV50_DISP_INTERLOCK_CORE] |= 1;
if (outp->flush_disable) {
nv50_disp_atomic_commit_wndw(state, interlock);
@@ -2105,7 +2159,7 @@ nv50_disp_atomic_commit_tail(struct drm_atomic_state *state)
outp->set.mask, outp->clr.mask);
if (outp->set.mask) {
- help->enable(encoder);
+ help->atomic_enable(encoder, state);
interlock[NV50_DISP_INTERLOCK_CORE] = 1;
}
I hacked up patch to use help->disable/help->enable if atomic_ versions
are NULL. It worked.
In my setup I stepped onto nv50_msto_help->atomic_enable == NULL. But
there are two more drm_encoder_helper_funcs in dispnv50/disp.c that don't
have atomic_enable/disable set: nv50_dac_help, nv50_pior_help.
--
Kirill A. Shutemov
next prev parent reply other threads:[~2020-11-03 22:20 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 1:33 [git pull] drm next pull for 5.10-rc1 Dave Airlie
2020-10-15 1:33 ` Dave Airlie
2020-10-15 2:58 ` Dave Airlie
2020-10-15 2:58 ` Dave Airlie
2020-10-15 13:59 ` Peilin Ye
2020-10-15 13:59 ` Peilin Ye
2020-10-15 14:53 ` Alex Deucher
2020-10-15 14:53 ` Alex Deucher
2020-10-15 14:55 ` Peilin Ye
2020-10-15 14:55 ` Peilin Ye
2020-10-15 17:51 ` Linus Torvalds
2020-10-15 17:51 ` Linus Torvalds
2020-10-15 18:42 ` Linus Torvalds
2020-10-15 18:42 ` Linus Torvalds
2020-10-15 19:13 ` Dave Airlie
2020-10-15 19:13 ` Dave Airlie
2020-10-15 17:56 ` pr-tracker-bot
2020-10-15 17:56 ` pr-tracker-bot
2020-11-03 22:20 ` Kirill A. Shutemov [this message]
2020-11-03 22:20 ` Kirill A. Shutemov
2020-11-04 21:58 ` Lyude Paul
2020-11-04 21:58 ` Lyude Paul
2020-11-09 11:52 ` Kirill A. Shutemov
2020-11-09 11:52 ` Kirill A. Shutemov
2020-11-09 17:50 ` Lyude Paul
2020-11-09 17:50 ` Lyude Paul
2020-11-09 19:08 ` Ville Syrjälä
2020-11-09 19:08 ` Ville Syrjälä
2020-11-09 19:33 ` Lyude Paul
2020-11-09 19:33 ` Lyude Paul
2020-11-12 17:33 ` Lyude Paul
2020-11-12 17:33 ` Lyude Paul
2020-11-15 17:57 ` Linus Torvalds
2020-11-15 17:57 ` Linus Torvalds
2020-11-15 20:35 ` Dave Airlie
2020-11-15 20:35 ` Dave Airlie
2020-11-16 19:25 ` Dave Airlie
2020-11-16 19:25 ` Dave Airlie
2020-11-12 13:15 ` Wen Pu
2020-11-12 13:15 ` Wen Pu
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=20201103222013.hypmzlq7uuqufe76@box \
--to=kirill@shutemov.name \
--cc=airlied@gmail.com \
--cc=bskeggs@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.