diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 12:44:56 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-10 19:12:58 +0100 |
| commit | 33abb68da2c49081f28898f93cc4e14702b40d70 (patch) | |
| tree | 69a486920d47ebe0cdd2177176a475cc6ae25795 | |
| parent | cfde920a2e449efaa387850173e46f87d928023b (diff) | |
sna/kgem: remove redundant clears upon initialisation
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/kgem.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c index 2c7f832e..e5a9c78f 100644 --- a/src/sna/kgem.c +++ b/src/sna/kgem.c @@ -296,14 +296,15 @@ void kgem_init(struct kgem *kgem, int fd, int gen) struct drm_i915_gem_get_aperture aperture; int i; + /* We presume we are partt of a zeroed structure + memset(kgem, 0, sizeof(*kgem)); + */ + kgem->fd = fd; kgem->gen = gen; kgem->wedged = drmCommandNone(kgem->fd, DRM_I915_GEM_THROTTLE) == -EIO; kgem->wedged |= DBG_NO_HW; - kgem->ring = kgem->mode = KGEM_NONE; - kgem->flush = 0; - list_init(&kgem->partial); list_init(&kgem->requests); list_init(&kgem->active); @@ -313,7 +314,6 @@ void kgem_init(struct kgem *kgem, int fd, int gen) kgem->next_request = __kgem_request_alloc(); - kgem->has_vmap = 0; #if defined(USE_VMAP) && defined(I915_PARAM_HAS_VMAP) if (!DBG_NO_VMAP) { drm_i915_getparam_t gp; @@ -328,7 +328,6 @@ void kgem_init(struct kgem *kgem, int fd, int gen) DBG(("%s: using vmap=%d\n", __FUNCTION__, kgem->has_vmap)); if (gen < 40) { - kgem->has_relaxed_fencing = 0; if (!DBG_NO_RELAXED_FENCING) { drm_i915_getparam_t gp; @@ -351,7 +350,6 @@ void kgem_init(struct kgem *kgem, int fd, int gen) kgem->aperture_high = aperture.aper_available_size * 3/4; kgem->aperture_low = aperture.aper_available_size * 1/4; - kgem->aperture = 0; DBG(("%s: aperture low=%d, high=%d\n", __FUNCTION__, kgem->aperture_low, kgem->aperture_high)); |