diff options
| author | Jesse Barnes <jbarnes@jbarnes-t61.(none)> | 2008-08-05 13:02:47 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-05 13:02:47 -0700 |
| commit | 4f1f30854260e18b8b9c4103eebbad5dcf729ce6 (patch) | |
| tree | c3fdc92c76fee35fee4e6e8b37d3aa45672e3c37 /src/i830_debug.c | |
| parent | e9e6b4738573ffa3822ae68088bd53a645eedbce (diff) | |
| parent | 2aaa207db2cea03ba05c439b5074807689f2c5be (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
src/i830_driver.c
Diffstat (limited to 'src/i830_debug.c')
| -rw-r--r-- | src/i830_debug.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/i830_debug.c b/src/i830_debug.c index 21e52504..1671e255 100644 --- a/src/i830_debug.c +++ b/src/i830_debug.c @@ -1314,8 +1314,6 @@ i830_valid_command (uint32_t cmd) if (!mi_cmds[opcode]) return -1; break; - case 1: - break; case 2: /* 2D */ count = (cmd & 0x1f) + 2; opcode = (cmd >> 22) & 0x7f; |