From: Lyude Paul <lyude@redhat.com>
To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org
Cc: "Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@linux.ie>,
"James Jones" <jajones@nvidia.com>,
"open list" <linux-kernel@vger.kernel.org>,
"Ben Skeggs" <bskeggs@redhat.com>,
"Christian König" <christian.koenig@amd.com>
Subject: [RFC v5 06/10] drm/nouveau/kms/nv50-: s/harm/armh/g
Date: Mon, 22 Jun 2020 16:07:26 -0400 [thread overview]
Message-ID: <20200622200730.120716-7-lyude@redhat.com> (raw)
In-Reply-To: <20200622200730.120716-1-lyude@redhat.com>
We refer to the armed hardware assembly as armh elsewhere in nouveau, so
fix the naming here to make it consistent.
This patch contains no functional changes.
Signed-off-by: Lyude Paul <lyude@redhat.com>
---
drivers/gpu/drm/nouveau/dispnv50/wndw.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.c b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
index 99b9b681736da..cfee61f14aa49 100644
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.c
@@ -408,7 +408,7 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
struct nv50_wndw *wndw = nv50_wndw(plane);
struct nv50_wndw_atom *armw = nv50_wndw_atom(wndw->plane.state);
struct nv50_wndw_atom *asyw = nv50_wndw_atom(state);
- struct nv50_head_atom *harm = NULL, *asyh = NULL;
+ struct nv50_head_atom *armh = NULL, *asyh = NULL;
bool modeset = false;
int ret;
@@ -429,9 +429,9 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
/* Fetch assembly state for the head the window used to belong to. */
if (armw->state.crtc) {
- harm = nv50_head_atom_get(asyw->state.state, armw->state.crtc);
- if (IS_ERR(harm))
- return PTR_ERR(harm);
+ armh = nv50_head_atom_get(asyw->state.state, armw->state.crtc);
+ if (IS_ERR(armh))
+ return PTR_ERR(armh);
}
/* LUT configuration can potentially cause the window to be disabled. */
@@ -455,8 +455,8 @@ nv50_wndw_atomic_check(struct drm_plane *plane, struct drm_plane_state *state)
asyh->wndw.mask |= BIT(wndw->id);
} else
if (armw->visible) {
- nv50_wndw_atomic_check_release(wndw, asyw, harm);
- harm->wndw.mask &= ~BIT(wndw->id);
+ nv50_wndw_atomic_check_release(wndw, asyw, armh);
+ armh->wndw.mask &= ~BIT(wndw->id);
} else {
return 0;
}
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-06-22 20:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-22 20:07 [RFC v5 00/10] drm/nouveau: Introduce CRC support for gf119+ Lyude Paul
2020-06-22 20:07 ` [RFC v5 01/10] drm/vblank: Register drmm cleanup action once per drm_vblank_crtc Lyude Paul
2020-06-23 16:17 ` Daniel Vetter
2020-06-22 20:07 ` [RFC v5 02/10] drm/vblank: Add vblank works Lyude Paul
2020-06-23 17:04 ` Daniel Vetter
2020-06-22 20:07 ` [RFC v5 03/10] drm/nouveau/kms/nv50-: Unroll error cleanup in nv50_head_create() Lyude Paul
2020-06-22 20:07 ` [RFC v5 04/10] drm/nouveau/kms/nv140-: Don't modify depth in state during atomic commit Lyude Paul
2020-06-22 20:07 ` [RFC v5 05/10] drm/nouveau/kms/nv50-: Fix disabling dithering Lyude Paul
2020-06-22 20:07 ` Lyude Paul [this message]
2020-06-22 20:07 ` [RFC v5 07/10] drm/nouveau/kms/nv140-: Track wndw mappings in nv50_head_atom Lyude Paul
2020-06-22 20:07 ` [RFC v5 08/10] drm/nouveau/kms/nv50-: Expose nv50_outp_atom in disp.h Lyude Paul
2020-06-22 20:07 ` [RFC v5 09/10] drm/nouveau/kms/nv50-: Move hard-coded object handles into header Lyude Paul
2020-06-22 20:07 ` [RFC v5 10/10] drm/nouveau/kms/nvd9-: Add CRC support Lyude Paul
2020-06-23 14:32 ` [RFC v6] " Lyude Paul
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=20200622200730.120716-7-lyude@redhat.com \
--to=lyude@redhat.com \
--cc=airlied@linux.ie \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jajones@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=tzimmermann@suse.de \
/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).