From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dave Jones Subject: Re: WARNING: at drivers/gpu/drm/radeon/radeon_object.c:236 Date: Tue, 27 Mar 2012 20:21:27 -0400 Message-ID: <20120328002127.GA8368@redhat.com> References: <20120326213250.GA16328@redhat.com> <1332829303.2882.52.camel@pasglop> <1332836421.5395.338.camel@thor.local> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1332836421.5395.338.camel@thor.local> Sender: linux-kernel-owner@vger.kernel.org To: Michel =?iso-8859-1?Q?D=E4nzer?= Cc: Benjamin Herrenschmidt , Linux Kernel , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Tue, Mar 27, 2012 at 10:20:21AM +0200, Michel D=E4nzer wrote: > On Die, 2012-03-27 at 17:21 +1100, Benjamin Herrenschmidt wrote: > > On Mon, 2012-03-26 at 17:32 -0400, Dave Jones wrote: > > > Seeing this in Linus' tree as of v3.3-6972-ge22057c > > =20 > > Same WARN_ON hit here on a G5 with rv350 >=20 > Thanks for the report, guys. Does the patch below help? >=20 >=20 > diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/dr= m/radeon/radeon_object.c > index f441d58..ad9d450 100644 > --- a/drivers/gpu/drm/radeon/radeon_object.c > +++ b/drivers/gpu/drm/radeon/radeon_object.c > @@ -233,7 +233,17 @@ int radeon_bo_pin_restricted(struct radeon_bo *= bo, u32 domain, u64 max_offset, > bo->pin_count++; > if (gpu_addr) > *gpu_addr =3D radeon_bo_gpu_offset(bo); > - WARN_ON_ONCE(max_offset !=3D 0); > + > + if (max_offset !=3D 0) { > + u64 domain_start; > + > + if (domain =3D=3D RADEON_GEM_DOMAIN_VRAM) > + domain_start =3D bo->rdev->mc.vram_start; > + else > + domain_start =3D bo->rdev->mc.gtt_start; > + WARN_ON_ONCE((*gpu_addr - domain_start) > max_offset); > + } > + > return 0; Stops the warning, and there are no additional side-effects, so looks all good here. Tested-by: Dave Jones thanks, Dave