[PATCH] drm/radeon: fix missing bo reservation (original) (raw)

Alex Deucher alexdeucher at gmail.com
Fri Feb 21 14:22:31 PST 2014


On Fri, Feb 21, 2014 at 4:26 PM, Dieter Nützel <Dieter at nuetzel-hh.de> wrote:

Alex,

shouldn't you send a pull request, that this land in 3.14-rc4? Just in case...

I'll send a pull request next week along with any other patches I've accumulated since the last pull. I usually try and send a -fixes pull once a week assuming there are fixes that need to go in.

Alex

Thanks, Dieter Am 20.02.2014 18:47, schrieb Christian König:

From: Christian König <christian.koenig at amd.com> Otherwise we might get a crash here. Signed-off-by: Christian König <christian.koenig at amd.com> Cc: stable at vger.kernel.org --- drivers/gpu/drm/radeon/radeonkms.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeonkms.c b/drivers/gpu/drm/radeon/radeonkms.c index 114d167..2aecd6d 100644 --- a/drivers/gpu/drm/radeon/radeonkms.c +++ b/drivers/gpu/drm/radeon/radeonkms.c @@ -537,6 +537,10 @@ int radeondriveropenkms(struct drmdevice *dev, struct drmfile *filepriv) radeonvminit(rdev, &fpriv->vm); + r = radeonboreserve(rdev->ringtmpbo.bo, false); + if (r) + return r; + /* map the ib pool buffer read only into * virtual address space */ bova = radeonvmboadd(rdev, &fpriv->vm, @@ -544,6 +548,8 @@ int radeondriveropenkms(struct drmdevice *dev, struct drmfile *filepriv) r = radeonvmbosetaddr(rdev, bova, RADEONVAIBOFFSET, RADEONVMPAGEREADABLE | RADEONVMPAGESNOOPED); + + radeonbounreserve(rdev->ringtmpbo.bo); if (r) { radeonvmfini(rdev, &fpriv->vm); kfree(fpriv);



More information about the dri-devel mailing list