From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LAvliRiC" Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 49234AA; Tue, 12 Dec 2023 07:05:26 -0800 (PST) Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-1feeea75fbfso3843514fac.3; Tue, 12 Dec 2023 07:05:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702393525; x=1702998325; darn=vger.kernel.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=5ZlcAkwpOLN8dI+Xyv/fIf9Doln7vlIRnH/1QEelY2c=; b=LAvliRiCrUaWjACDI2I6tFioP5VMh2RHqomdpsaX0HM8HZgbKmbe2cOwr3zSlpifc3 t14NLEMXvUfEy/oF4U+Iiw+lxbiM4yYx9jXOuuDk/r175SFzxXOXxZ1wMCbBg0hW6E41 q6pPziz8JCCRKbJ0Pjr/cR/XFpUzb6OhxAgGeeZOKLwYpYEd/b+m0svgDBOGVrpFwrGE GWwIR3DHyk8D5E668L9OzpsnddcHj440VUHlQpOgMVxxwlPX79k6ws6xZa6DWwmxhBjL XD0n9EvAHQaD9f9nZgTIKO47H7k6v76SyOp9LzA3nm305aRVo76J5M32xXyPX3lrfgpO Su5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702393525; x=1702998325; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5ZlcAkwpOLN8dI+Xyv/fIf9Doln7vlIRnH/1QEelY2c=; b=Gpv8Q6Z/txPijiId8fFLPw+iBIY+F/AC2YWGPHEs2OjtFAxgtsHrdW66e3x0JMqFDR TRpF0GfkZgY8m1PaMp/P8SEWxeUQz/ystUzo0Ajan/Ec0nfZuXZm3WffOmI4otYfM136 4U3hxkTVcq+aNZWuhO3I1cGPaP3L/9dnu5OVw0InSjyiYec6KsijiD28U+4LMYQs7nvv qfC9it2iRfCw3gGiyp+GwId8afvY1vjBBPZ/Z0hpzrz/QjDKSwdJBZRsiLAhY4yNxXDa SHTo3xcDFSdaUrdL69bwYDbbn3KDOktPPr/5irbN/l0Ou4V6eIkI8t5m2DFNZmokPzn9 nu0Q== X-Gm-Message-State: AOJu0YxD8pKLM7mnwqUgFn3exABkAyrEnnZDdxxBx27VpO4uq4JJ57dW OndsafID4MLnyRnbZwJH/6IhSVIXLF7zwrHExpI= X-Google-Smtp-Source: AGHT+IEvVnV0yK8+EB7ShGHex+/thdL3le4AIysKjBzLXZiLoBhD7nDJseZJrG+ivC8oDEwoUazhqbq1SFJsrdgOO9I= X-Received: by 2002:a05:6870:a54d:b0:1fa:2d2c:9ca4 with SMTP id p13-20020a056870a54d00b001fa2d2c9ca4mr5797061oal.49.1702393525463; Tue, 12 Dec 2023 07:05:25 -0800 (PST) Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 References: <20231212110415.6f849fb4@canb.auug.org.au> <20231212140134.13ffafa8@canb.auug.org.au> <20231212090159.hshy6elwhgkkhuzb@mail.igalia.com> In-Reply-To: <20231212090159.hshy6elwhgkkhuzb@mail.igalia.com> From: Alex Deucher Date: Tue, 12 Dec 2023 10:05:14 -0500 Message-ID: Subject: Re: linux-next: build warning after merge of the amdgpu tree To: Melissa Wen Cc: Stephen Rothwell , Alex Deucher , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Dec 12, 2023 at 4:02=E2=80=AFAM Melissa Wen wrote= : > > On 12/12, Stephen Rothwell wrote: > > Hi all, > > > > On Tue, 12 Dec 2023 11:04:15 +1100 Stephen Rothwell wrote: > > > > > > After merging the amdgpu tree, today's linux-next build (arm > > > multi_v7_defconfig) produced this warning: > > > > > > drivers/gpu/drm/drm_atomic_uapi.c:366:1: warning: 'drm_atomic_replace= _property_blob_from_id' defined but not used [-Wunused-function] > > > 366 | drm_atomic_replace_property_blob_from_id(struct drm_device *d= ev, > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > > > Introduced by commit > > > > > > 1d2b049e4582 ("drm/drm_property: make replace_property_blob_from_id= a DRM helper") > > > > This became a build failure in the i386 defconfig build, so I applied > > the following patch for today. > > Yes, I also noticed it yesterday when building amd-staging-drm-next. > > Something went wrong when they applied this patch: > https://lore.kernel.org/amd-gfx/20231116195812.906115-3-mwen@igalia.com/ > and your patch below is exactly the part of this patch ^ that is > missing. I'll ask the display guys what happened there, but in the meantime, I'll fix that up. > > In addition, only the first four patches of the series were applied. The rest were still going through CI when I pushed out my updates. Alex > > Thanks, > > Melissa > > > > > From: Stephen Rothwell > > Date: Tue, 12 Dec 2023 13:53:55 +1100 > > Subject: [PATCH] drm: remove unused function drm_atomic_replace_propert= y_blob_from_id() > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/gpu/drm/drm_atomic_uapi.c | 42 ------------------------------- > > 1 file changed, 42 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_atomic_uapi.c b/drivers/gpu/drm/drm_at= omic_uapi.c > > index 70ddbb93e466..29d4940188d4 100644 > > --- a/drivers/gpu/drm/drm_atomic_uapi.c > > +++ b/drivers/gpu/drm/drm_atomic_uapi.c > > @@ -362,48 +362,6 @@ static s32 __user *get_out_fence_for_connector(str= uct drm_atomic_state *state, > > return fence_ptr; > > } > > > > -static int > > -drm_atomic_replace_property_blob_from_id(struct drm_device *dev, > > - struct drm_property_blob **blob, > > - uint64_t blob_id, > > - ssize_t expected_size, > > - ssize_t expected_elem_size, > > - bool *replaced) > > -{ > > - struct drm_property_blob *new_blob =3D NULL; > > - > > - if (blob_id !=3D 0) { > > - new_blob =3D drm_property_lookup_blob(dev, blob_id); > > - if (new_blob =3D=3D NULL) { > > - drm_dbg_atomic(dev, > > - "cannot find blob ID %llu\n", blob= _id); > > - return -EINVAL; > > - } > > - > > - if (expected_size > 0 && > > - new_blob->length !=3D expected_size) { > > - drm_dbg_atomic(dev, > > - "[BLOB:%d] length %zu different fr= om expected %zu\n", > > - new_blob->base.id, new_blob->lengt= h, expected_size); > > - drm_property_blob_put(new_blob); > > - return -EINVAL; > > - } > > - if (expected_elem_size > 0 && > > - new_blob->length % expected_elem_size !=3D 0) { > > - drm_dbg_atomic(dev, > > - "[BLOB:%d] length %zu not divisibl= e by element size %zu\n", > > - new_blob->base.id, new_blob->lengt= h, expected_elem_size); > > - drm_property_blob_put(new_blob); > > - return -EINVAL; > > - } > > - } > > - > > - *replaced |=3D drm_property_replace_blob(blob, new_blob); > > - drm_property_blob_put(new_blob); > > - > > - return 0; > > -} > > - > > static int drm_atomic_crtc_set_property(struct drm_crtc *crtc, > > struct drm_crtc_state *state, struct drm_property *proper= ty, > > uint64_t val) > > -- > > 2.40.1 > > > > -- > > Cheers, > > Stephen Rothwell > >