From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D0916148316; Thu, 23 May 2024 12:13:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716466415; cv=none; b=CKi1Db0nkyAYbiTgwSxpWAFwqKCyATzy41eVRDYy8r+4JAqDIaKNe60kZeWTquleqGUYuHnteAzJW+dSvJo1paj1OL3JHuhovE0aXFhclOhDgGN90SaD+VJHUoDX9mqPF5yoiIAsekdeXZIohWUHAv/S4DOrHpSmJ2u6wsZ1ZBE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716466415; c=relaxed/simple; bh=aeQ1eCV/OYFIzW5W9o7Rm16kTK0XBOoJtW9zhuyRyP8=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nhzHvQ01a1fmXR2k/VwoZgsF7SYr4gSnYutejOqTsYZPZo+kE3dsA8kQ/cfa5yF4OB2IHSj8DB1aexIYzj8/Nx7kfJlTPP6/ZWLJS/L+mWvMDUicpr1Sc3lmC2ucw3PkFgpTsMqbX9KeFO9dIvoVrsE6FyvrPXn80pHWsrxSFxM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=A8b03q1K; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="A8b03q1K" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1716466412; bh=aeQ1eCV/OYFIzW5W9o7Rm16kTK0XBOoJtW9zhuyRyP8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=A8b03q1KO14uSrOcZ3mHzaAeHTBDeHvQe/MMVymQnmpdB95Ft2Pj4Tz7l2+gV5Efa hwXMCx3zq5IE0i+Cf2J5tA1PvtcLmHIubxjeU1yJSUMD9c5GrFnxBFh4FDHb4TNrw0 VFuBaMLSYtRoR2NeC41NFRYW3nagRYP+CK0Riv/kHmIJIspDl0x6QQS9uNI3wotrL1 esMzAHieAWHFvjebc6Fcb2EmEqCyB0Uu2yXTW4IzvS4YOdPKFvajZchcOtx4i0WFGW t8V6t3igizvZrC+3MpLYH6iitiMa0jieFmilN78VSdQ4FVO3l9z1RmEnvHqNedxCNR v9qAbRFXIsYlw== Received: from localhost (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: bbrezillon) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 5A6E13782039; Thu, 23 May 2024 12:13:31 +0000 (UTC) Date: Thu, 23 May 2024 14:13:30 +0200 From: Boris Brezillon To: =?UTF-8?B?QWRyacOhbg==?= Larumbe Cc: Rob Herring , Steven Price , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Sumit Semwal , Christian =?UTF-8?B?S8O2bmln?= , Dmitry Osipenko , Zack Rusin , kernel@collabora.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: Re: [PATCH v4 3/3] drm/gem-shmem: Add import attachment warning to locked pin function Message-ID: <20240523141330.374fb505@collabora.com> In-Reply-To: <20240523113236.432585-4-adrian.larumbe@collabora.com> References: <20240523113236.432585-1-adrian.larumbe@collabora.com> <20240523113236.432585-4-adrian.larumbe@collabora.com> Organization: Collabora X-Mailer: Claws Mail 4.2.0 (GTK 3.24.41; x86_64-redhat-linux-gnu) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 23 May 2024 12:32:19 +0100 Adri=C3=A1n Larumbe wrote: > Commit ec144244a43f ("drm/gem-shmem: Acquire reservation lock in GEM > pin/unpin callbacks") moved locking DRM object's dma reservation to > drm_gem_shmem_object_pin, and made drm_gem_shmem_pin_locked public, so we > need to make sure the non-NULL check warning is also added to the latter. >=20 > Cc: Thomas Zimmermann > Cc: Dmitry Osipenko > Cc: Boris Brezillon > Fixes: a78027847226 ("drm/gem: Acquire reservation lock in drm_gem_{pin/u= npin}()") > Signed-off-by: Adri=C3=A1n Larumbe Reviewed-by: Boris Brezillon > --- > drivers/gpu/drm/drm_gem_shmem_helper.c | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm= _gem_shmem_helper.c > index 177773bcdbfd..ad5d9f704e15 100644 > --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > @@ -233,6 +233,8 @@ int drm_gem_shmem_pin_locked(struct drm_gem_shmem_obj= ect *shmem) > =20 > dma_resv_assert_held(shmem->base.resv); > =20 > + drm_WARN_ON(shmem->base.dev, shmem->base.import_attach); > + > ret =3D drm_gem_shmem_get_pages(shmem); > =20 > return ret;