code.ossystems Code Review - openembedded-core.git/blob

   1 commit 91019197abbfde388d0b71b0fc8979a936c23fe3
   2 Author: Keith Packard <keithp@keithp.com>
   3 Date:   Wed Jul 30 12:28:47 2008 -0700
   4
   5     i915: remove settable use_mi_batchbuffer_start
   6
   7     The driver can know what hardware requires MI_BATCH_BUFFER vs
   8     MI_BATCH_BUFFER_START; there's no reason to let user mode configure this.
   9
  10     Signed-off-by: Eric Anholt <eric@anholt.net>
  11     Signed-off-by: Dave Airlie <airlied@redhat.com>
  12
  13 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
  14 index 8897434..24adbde 100644
  15 --- a/drivers/gpu/drm/i915/i915_dma.c
  16 +++ b/drivers/gpu/drm/i915/i915_dma.c
  17 @@ -159,13 +159,6 @@ static int i915_initialize(struct drm_device * dev, drm_i915_init_t * init)
  18         dev_priv->current_page = 0;
  19         dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
  20
  21 -       /* We are using separate values as placeholders for mechanisms for
  22 -        * private backbuffer/depthbuffer usage.
  23 -        */
  24 -       dev_priv->use_mi_batchbuffer_start = 0;
  25 -       if (IS_I965G(dev)) /* 965 doesn't support older method */
  26 -               dev_priv->use_mi_batchbuffer_start = 1;
  27 -
  28         /* Allow hardware batchbuffers unless told otherwise.
  29          */
  30         dev_priv->allow_batchbuffer = 1;
  31 @@ -486,7 +479,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
  32                                 return ret;
  33                 }
  34
  35 -               if (dev_priv->use_mi_batchbuffer_start) {
  36 +               if (!IS_I830(dev) && !IS_845G(dev)) {
  37                         BEGIN_LP_RING(2);
  38                         if (IS_I965G(dev)) {
  39                                 OUT_RING(MI_BATCH_BUFFER_START | (2 << 6) | MI_BATCH_NON_SECURE_I965);
  40 @@ -697,8 +690,6 @@ static int i915_setparam(struct drm_device *dev, void *data,
  41
  42         switch (param->param) {
  43         case I915_SETPARAM_USE_MI_BATCHBUFFER_START:
  44 -               if (!IS_I965G(dev))
  45 -                       dev_priv->use_mi_batchbuffer_start = param->value;
  46                 break;
  47         case I915_SETPARAM_TEX_LRU_LOG_GRANULARITY:
  48                 dev_priv->tex_lru_log_granularity = param->value;
  49 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
  50 index d7326d9..2d441d3 100644
  51 --- a/drivers/gpu/drm/i915/i915_drv.h
  52 +++ b/drivers/gpu/drm/i915/i915_drv.h
  53 @@ -99,7 +99,6 @@ typedef struct drm_i915_private {
  54         int front_offset;
  55         int current_page;
  56         int page_flipping;
  57 -       int use_mi_batchbuffer_start;
  58
  59         wait_queue_head_t irq_queue;
  60         atomic_t irq_received;