From fd16ba90df89239db9c2b2bec3b3a45542298261 Mon Sep 17 00:00:00 2001 From: Kevin E Martin Date: Mon, 25 Sep 2000 00:55:36 +0000 Subject: [PATCH] - Driver reorganized to accomodate both Rage 128 and Radeon drivers - Added initial Radeon 2D driver (non-functional) - Included M3 patch - Generel driver clean up - Brought drm kenrel drivers up to date --- linux/mga_dma.c | 3 ++- linux/picker.c | 2 +- linux/r128_drv.h | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/linux/mga_dma.c b/linux/mga_dma.c index ae1d3e12..4daa03ac 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -226,11 +226,11 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) add_wait_queue(&dev_priv->buf_queue, &entry); for (;;) { mga_dma_schedule(dev, 0); + current->state = TASK_INTERRUPTIBLE; if(!test_bit(MGA_IN_GETBUF, &dev_priv->dispatch_status)) break; atomic_inc(&dev->total_sleeps); - current->state = TASK_INTERRUPTIBLE; schedule(); if (signal_pending(current)) { ++return_null; @@ -239,6 +239,7 @@ drm_buf_t *mga_freelist_get(drm_device_t *dev) break; } } + current->state = TASK_RUNNING; remove_wait_queue(&dev_priv->buf_queue, &entry); if (return_null) return NULL; } diff --git a/linux/picker.c b/linux/picker.c index f8cfe459..6053a947 100644 --- a/linux/picker.c +++ b/linux/picker.c @@ -1,4 +1,4 @@ -#include +#include #include #ifndef CONFIG_SMP diff --git a/linux/r128_drv.h b/linux/r128_drv.h index e0eef6d2..da2f676d 100644 --- a/linux/r128_drv.h +++ b/linux/r128_drv.h @@ -11,11 +11,11 @@ * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice (including the next * paragraph) shall be included in all copies or substantial portions of the * Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -23,7 +23,7 @@ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. - * + * * Authors: Rickard E. (Rik) Faith * Kevin E. Martin *