From: Danilo Krummrich <dakr@redhat.com>
To: Easwar Hariharan <eahariha@linux.microsoft.com>,
Karol Herbst <kherbst@redhat.com>, Lyude Paul <lyude@redhat.com>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<dri-devel@lists.freedesktop.org>,
"open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS"
<nouveau@lists.freedesktop.org>,
open list <linux-kernel@vger.kernel.org>
Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>,
"open list:RADEON and AMDGPU DRM DRIVERS"
<amd-gfx@lists.freedesktop.org>,
"open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS"
<intel-gfx@lists.freedesktop.org>,
"open list:INTEL DRM DISPLAY FOR XE AND I915 DRIVERS"
<intel-xe@lists.freedesktop.org>,
"open list:I2C SUBSYSTEM HOST DRIVERS"
<linux-i2c@vger.kernel.org>,
"open list:BTTV VIDEO4LINUX DRIVER" <linux-media@vger.kernel.org>,
"open list:FRAMEBUFFER LAYER" <linux-fbdev@vger.kernel.org>
Subject: Re: [PATCH v0 13/14] drm/nouveau: Make I2C terminology more inclusive
Date: Fri, 5 Apr 2024 18:15:06 +0200 [thread overview]
Message-ID: <4dc6fb16-3d85-4a7f-85f9-ed249da0df1a@redhat.com> (raw)
In-Reply-To: <20240329170038.3863998-14-eahariha@linux.microsoft.com>
Hi Easwar,
On 3/29/24 18:00, Easwar Hariharan wrote:
> I2C v7, SMBus 3.2, and I3C specifications have replaced "master/slave"
> with more appropriate terms. Inspired by and following on to Wolfram's
> series to fix drivers/i2c/[1], fix the terminology for users of
> I2C_ALGOBIT bitbanging interface, now that the approved verbiage exists
> in the specification.
>
> Compile tested, no functionality changes intended
>
> [1]: https://lore.kernel.org/all/20240322132619.6389-1-wsa+renesas@sang-engineering.com/
>
> Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
> ---
> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 14 +++++++-------
> .../gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h | 2 +-
> drivers/gpu/drm/nouveau/nouveau_bios.c | 4 ++--
> 3 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> index d5b129dc623b..65b791006b19 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> @@ -149,7 +149,7 @@ void nv04_dfp_update_fp_control(struct drm_encoder *encoder, int mode)
> }
> }
>
> -static struct drm_encoder *get_tmds_slave(struct drm_encoder *encoder)
> +static struct drm_encoder *get_tmds_client(struct drm_encoder *encoder)
> {
> struct drm_device *dev = encoder->dev;
> struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;
> @@ -172,7 +172,7 @@ static struct drm_encoder *get_tmds_slave(struct drm_encoder *encoder)
> struct dcb_output *slave_dcb = nouveau_encoder(slave)->dcb;
>
> if (slave_dcb->type == DCB_OUTPUT_TMDS && get_slave_funcs(slave) &&
> - slave_dcb->tmdsconf.slave_addr == dcb->tmdsconf.slave_addr)
> + slave_dcb->tmdsconf.client_addr == dcb->tmdsconf.client_addr)
> return slave;
While, personally, I think master/slave was well suiting for the device relationship
on those busses, I think that if we change it up to conform with the change in
specification, we should make sure to update drivers consistently.
We should make sure to also change the names of the sourrounding structures and variable
names, otherwise we just make this code harder to read.
- Danilo
> }
>
> @@ -471,7 +471,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
> NVWriteRAMDAC(dev, 0, NV_PRAMDAC_TEST_CONTROL + nv04_dac_output_offset(encoder), 0x00100000);
>
> /* Init external transmitters */
> - slave_encoder = get_tmds_slave(encoder);
> + slave_encoder = get_tmds_client(encoder);
> if (slave_encoder)
> get_slave_funcs(slave_encoder)->mode_set(
> slave_encoder, &nv_encoder->mode, &nv_encoder->mode);
> @@ -621,7 +621,7 @@ static void nv04_dfp_destroy(struct drm_encoder *encoder)
> kfree(nv_encoder);
> }
>
> -static void nv04_tmds_slave_init(struct drm_encoder *encoder)
> +static void nv04_tmds_client_init(struct drm_encoder *encoder)
> {
> struct drm_device *dev = encoder->dev;
> struct dcb_output *dcb = nouveau_encoder(encoder)->dcb;
> @@ -632,7 +632,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder)
> {
> {
> .type = "sil164",
> - .addr = (dcb->tmdsconf.slave_addr == 0x7 ? 0x3a : 0x38),
> + .addr = (dcb->tmdsconf.client_addr == 0x7 ? 0x3a : 0x38),
> .platform_data = &(struct sil164_encoder_params) {
> SIL164_INPUT_EDGE_RISING
> }
> @@ -642,7 +642,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder)
> };
> int type;
>
> - if (!nv_gf4_disp_arch(dev) || !bus || get_tmds_slave(encoder))
> + if (!nv_gf4_disp_arch(dev) || !bus || get_tmds_client(encoder))
> return;
>
> type = nvkm_i2c_bus_probe(bus, "TMDS transmitter", info, NULL, NULL);
> @@ -716,7 +716,7 @@ nv04_dfp_create(struct drm_connector *connector, struct dcb_output *entry)
>
> if (entry->type == DCB_OUTPUT_TMDS &&
> entry->location != DCB_LOC_ON_CHIP)
> - nv04_tmds_slave_init(encoder);
> + nv04_tmds_client_init(encoder);
>
> drm_connector_attach_encoder(connector, encoder);
> return 0;
> diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> index 73f9d9947e7e..5da40cf74b1a 100644
> --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h
> @@ -50,7 +50,7 @@ struct dcb_output {
> } dpconf;
> struct {
> struct sor_conf sor;
> - int slave_addr;
> + int client_addr;
> } tmdsconf;
> };
> bool i2c_upper_default;
> diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
> index 479effcf607e..a91a5d3df3ca 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
> @@ -1511,9 +1511,9 @@ parse_dcb20_entry(struct drm_device *dev, struct dcb_table *dcb,
> link = entry->tmdsconf.sor.link;
> }
> else if (dcb->version >= 0x30)
> - entry->tmdsconf.slave_addr = (conf & 0x00000700) >> 8;
> + entry->tmdsconf.client_addr = (conf & 0x00000700) >> 8;
> else if (dcb->version >= 0x22)
> - entry->tmdsconf.slave_addr = (conf & 0x00000070) >> 4;
> + entry->tmdsconf.client_addr = (conf & 0x00000070) >> 4;
> break;
> case DCB_OUTPUT_EOL:
> /* weird g80 mobile type that "nv" treats as a terminator */
next prev parent reply other threads:[~2024-04-05 16:15 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-29 17:00 [PATCH v0 00/14] Make I2C terminology more inclusive for I2C Algobit and consumers Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 01/14] IB/hfi1, IB/qib: Make I2C terminology more inclusive Easwar Hariharan
2024-04-03 8:30 ` Leon Romanovsky
2024-04-03 15:54 ` Dennis Dalessandro
2024-04-03 16:44 ` Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 02/14] drm/amdgpu,drm/radeon: " Easwar Hariharan
2024-03-29 17:16 ` Andi Shyti
2024-03-29 17:28 ` Easwar Hariharan
2024-03-29 17:38 ` Andi Shyti
2024-03-29 18:51 ` Easwar Hariharan
2024-03-29 17:38 ` Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 03/14] drm/gma500,drm/i915: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 03/14] drm/gma500, drm/i915: " Easwar Hariharan
2024-04-02 7:48 ` [PATCH v0 03/14] drm/gma500,drm/i915: " Jani Nikula
2024-04-02 11:59 ` Easwar Hariharan
2024-04-02 14:32 ` Jani Nikula
2024-04-02 16:20 ` Easwar Hariharan
2024-04-02 16:52 ` Jani Nikula
2024-04-02 18:19 ` Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 04/14] media: au0828: " Easwar Hariharan
2024-05-03 19:03 ` Mauro Carvalho Chehab
2024-03-29 17:00 ` [PATCH v0 05/14] media: cobalt: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 06/14] media: cx18: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 07/14] media: cx25821: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 08/14] media: ivtv: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 09/14] media: cx23885: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 10/14] sfc: falcon: " Easwar Hariharan
2024-04-02 8:29 ` Simon Horman
2024-04-04 19:17 ` Easwar Hariharan
2024-04-07 8:49 ` Simon Horman
2024-04-02 9:00 ` Martin Habets
2024-04-04 19:18 ` Easwar Hariharan
2024-04-08 8:35 ` Martin Habets
2024-03-29 17:00 ` [PATCH v0 11/14] fbdev/smscufx: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 12/14] fbdev/viafb: " Easwar Hariharan
2024-03-29 17:00 ` [PATCH v0 13/14] drm/nouveau: " Easwar Hariharan
2024-04-05 16:15 ` Danilo Krummrich [this message]
2024-04-05 16:30 ` Easwar Hariharan
2024-04-05 18:36 ` Lyude Paul
2024-03-29 17:00 ` [PATCH v0 14/14] i2c and treewide: " Easwar Hariharan
2024-04-05 10:18 ` [PATCH v0 00/14] Make I2C terminology more inclusive for I2C Algobit and consumers Wolfram Sang
2024-04-05 17:09 ` Easwar Hariharan
2024-04-07 17:50 ` Wolfram Sang
2024-04-08 7:48 ` Hans Verkuil
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=4dc6fb16-3d85-4a7f-85f9-ed249da0df1a@redhat.com \
--to=dakr@redhat.com \
--cc=airlied@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=eahariha@linux.microsoft.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=kherbst@redhat.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=nouveau@lists.freedesktop.org \
--cc=wsa+renesas@sang-engineering.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).