On Wed, Dec 09, 2009 at 02:50:26PM +1000, Dave Airlie wrote:
> On Wed, Dec 9, 2009 at 4:29 AM, Jerome Glisse <jgli...@redhat.com> wrote:
> > Initialize some value to safe default in case we hit an
> > error path which would leads to uninitialized value.
> >
>
> NAK,
>
> this crashes stuff fairly badly I can see it wasn't actually booted at all.
>
> Dave.
>
Note to myself don't forget git format-patch -1 after fixing a bug...
Cheers,
Jerome
>From fa123692cbd247945081d34d89a835ade3931669 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <jgli...@redhat.com>
Date: Tue, 8 Dec 2009 19:27:45 +0100
Subject: [PATCH] drm/radeon/kms: Initialize some value to safe default
Initialize some value to safe default in case we hit an
error path which would leads to uninitialized value.
Signed-off-by: Jerome Glisse <jgli...@redhat.com>
---
drivers/gpu/drm/radeon/radeon_gem.c | 2 +-
drivers/gpu/drm/radeon/radeon_object.h | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_gem.c
b/drivers/gpu/drm/radeon/radeon_gem.c
index e927f99..2944486 100644
--- a/drivers/gpu/drm/radeon/radeon_gem.c
+++ b/drivers/gpu/drm/radeon/radeon_gem.c
@@ -268,7 +268,7 @@ int radeon_gem_busy_ioctl(struct drm_device *dev, void
*data,
struct drm_gem_object *gobj;
struct radeon_bo *robj;
int r;
- uint32_t cur_placement;
+ uint32_t cur_placement = 0;
gobj = drm_gem_object_lookup(dev, filp, args->handle);
if (gobj == NULL) {
diff --git a/drivers/gpu/drm/radeon/radeon_object.h
b/drivers/gpu/drm/radeon/radeon_object.h
index e9da130..9ca7c2e 100644
--- a/drivers/gpu/drm/radeon/radeon_object.h
+++ b/drivers/gpu/drm/radeon/radeon_object.h
@@ -125,6 +125,8 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32
*mem_type,
{
int r;
+ if (mem_type)
+ *mem_type = 0;
retry:
r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0);
if (unlikely(r != 0)) {
--
1.6.5.2
------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
