aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_ringbuffer.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2012-04-26 17:28:14 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-03 05:18:30 -0400
commit627965ad3e2f8aa9311f8b238060ddb648268f6b (patch)
tree43f1ab8c819da098cf269d978d5ae198c508fcb5 /drivers/gpu/drm/i915/intel_ringbuffer.c
parentb3daeaef559d87b974c13a096582c5c70dc11061 (diff)
drm/i915: kill pointless clearing of dev_priv->hws_map
We kzalloc dev_priv, and we never use hws_map in intel_ringbuffer.c. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r--drivers/gpu/drm/i915/intel_ringbuffer.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index a7d97d17b285..df3a770d60fa 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -890,7 +890,6 @@ i915_dispatch_execbuffer(struct intel_ring_buffer *ring,
890 890
891static void cleanup_status_page(struct intel_ring_buffer *ring) 891static void cleanup_status_page(struct intel_ring_buffer *ring)
892{ 892{
893 drm_i915_private_t *dev_priv = ring->dev->dev_private;
894 struct drm_i915_gem_object *obj; 893 struct drm_i915_gem_object *obj;
895 894
896 obj = ring->status_page.obj; 895 obj = ring->status_page.obj;
@@ -901,14 +900,11 @@ static void cleanup_status_page(struct intel_ring_buffer *ring)
901 i915_gem_object_unpin(obj); 900 i915_gem_object_unpin(obj);
902 drm_gem_object_unreference(&obj->base); 901 drm_gem_object_unreference(&obj->base);
903 ring->status_page.obj = NULL; 902 ring->status_page.obj = NULL;
904
905 memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
906} 903}
907 904
908static int init_status_page(struct intel_ring_buffer *ring) 905static int init_status_page(struct intel_ring_buffer *ring)
909{ 906{
910 struct drm_device *dev = ring->dev; 907 struct drm_device *dev = ring->dev;
911 drm_i915_private_t *dev_priv = dev->dev_private;
912 struct drm_i915_gem_object *obj; 908 struct drm_i915_gem_object *obj;
913 int ret; 909 int ret;
914 910
@@ -929,7 +925,6 @@ static int init_status_page(struct intel_ring_buffer *ring)
929 ring->status_page.gfx_addr = obj->gtt_offset; 925 ring->status_page.gfx_addr = obj->gtt_offset;
930 ring->status_page.page_addr = kmap(obj->pages[0]); 926 ring->status_page.page_addr = kmap(obj->pages[0]);
931 if (ring->status_page.page_addr == NULL) { 927 if (ring->status_page.page_addr == NULL) {
932 memset(&dev_priv->hws_map, 0, sizeof(dev_priv->hws_map));
933 goto err_unpin; 928 goto err_unpin;
934 } 929 }
935 ring->status_page.obj = obj; 930 ring->status_page.obj = obj;