- 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
This commit is contained in:
Kevin E Martin 2000-09-25 00:55:36 +00:00
parent dc6b57bf22
commit fd16ba90df
3 changed files with 6 additions and 5 deletions

View file

@ -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;
}

View file

@ -1,4 +1,4 @@
#include <linux/autoconf.h>
#include <linux/config.h>
#include <linux/version.h>
#ifndef CONFIG_SMP

View file

@ -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 <faith@valinux.com>
* Kevin E. Martin <martin@valinux.com>
*