From 64b3530cc990daed1abf02ee87eb43006b2edbc9 Mon Sep 17 00:00:00 2001 From: Matt Sealey Date: Fri, 26 Aug 2011 11:08:56 -0500 Subject: [PATCH] gpu os abstraction: kos_thread_create/destroy was only used for !LINUX, so just get rid of it --- drivers/mxc/amd-gpu/common/gsl_g12.c | 19 +++---------- .../amd-gpu/os/kernel/include/kos_libapi.h | 28 ------------------- .../mxc/amd-gpu/os/kernel/src/linux/kos_lib.c | 12 -------- 3 files changed, 4 insertions(+), 55 deletions(-) diff --git a/drivers/mxc/amd-gpu/common/gsl_g12.c b/drivers/mxc/amd-gpu/common/gsl_g12.c index b144a52bb16..ef10129a016 100644 --- a/drivers/mxc/amd-gpu/common/gsl_g12.c +++ b/drivers/mxc/amd-gpu/common/gsl_g12.c @@ -317,16 +317,9 @@ kgsl_g12_init(gsl_device_t *device) #endif //_Z180 // create thread for IRQ handling -#if defined(__SYMBIAN32__) - kos_thread_create( (oshandle_t)irq_thread, &(device->irq_thread) ); -#elif defined(_LINUX) - device->irq_workq = create_singlethread_workqueue("z1xx_workq"); - INIT_WORK(&device->irq_work, kgsl_g12_irqtask); - INIT_WORK(&device->irq_err_work, kgsl_g12_irqerr); -#else - #pragma warning(disable:4152) - device->irq_thread_handle = kos_thread_create( (oshandle_t)irq_thread, &(device->irq_thread) ); -#endif + device->irq_workq = create_singlethread_workqueue("z160_workqueue"); + INIT_WORK(&device->irq_work, kgsl_g12_irqtask); + INIT_WORK(&device->irq_err_work, kgsl_g12_irqerr); return (status); } @@ -346,11 +339,7 @@ kgsl_g12_close(gsl_device_t *device) status = device->ftbl.device_idle(device, 1000); KOS_ASSERT(status == GSL_SUCCESS); -#ifndef _LINUX - kos_thread_destroy(device->irq_thread_handle); -#else - destroy_workqueue(device->irq_workq); -#endif + destroy_workqueue(device->irq_workq); // shutdown command window kgsl_cmdwindow_close(device); diff --git a/drivers/mxc/amd-gpu/os/kernel/include/kos_libapi.h b/drivers/mxc/amd-gpu/os/kernel/include/kos_libapi.h index 591623d734c..d6cc00d10af 100644 --- a/drivers/mxc/amd-gpu/os/kernel/include/kos_libapi.h +++ b/drivers/mxc/amd-gpu/os/kernel/include/kos_libapi.h @@ -441,34 +441,6 @@ KOS_API unsigned int kos_process_getid(void); * \return Returns the caller process id. *//*-------------------------------------------------------------------*/ KOS_API unsigned int kos_callerprocess_getid(void); -/*-------------------------------------------------------------------*//*! - * \external - * \brief Get the id of the current thread. - * - * - * \return Returns the thread id. - *//*-------------------------------------------------------------------*/ -KOS_API unsigned int kos_thread_getid(void); - -/*-------------------------------------------------------------------*//*! - * \external - * \brief Create a new thread. - * - * - * \param oshandle_t a_function Handle to the function to be executed in the thread. - * \param unsigned int* a_threadId Pointer to a value where to store the ID of the new thread. - * \return Returns an handle to the created thread. - *//*-------------------------------------------------------------------*/ -KOS_API oshandle_t kos_thread_create(oshandle_t a_function, unsigned int* a_threadId); - -/*-------------------------------------------------------------------*//*! - * \external - * \brief Destroy the given thread. - * - * - * \param oshandle_t a_task Handle to the thread to be destroyed. - *//*-------------------------------------------------------------------*/ -KOS_API void kos_thread_destroy( oshandle_t a_task ); ////////////////////////////////////////////////////////////////////////////// // timing API diff --git a/drivers/mxc/amd-gpu/os/kernel/src/linux/kos_lib.c b/drivers/mxc/amd-gpu/os/kernel/src/linux/kos_lib.c index b09091f43f0..44b56217bfd 100644 --- a/drivers/mxc/amd-gpu/os/kernel/src/linux/kos_lib.c +++ b/drivers/mxc/amd-gpu/os/kernel/src/linux/kos_lib.c @@ -363,15 +363,3 @@ KOS_API int kos_syncblock_end(void) return return_value; } - -KOS_API oshandle_t kos_thread_create(oshandle_t a_function, unsigned int* a_threadId) -{ - struct task_struct *task = kthread_run(a_function, 0, "kos_thread_%p", a_threadId); - *a_threadId = (unsigned int)task; - return (oshandle_t)task; -} - -KOS_API void kos_thread_destroy( oshandle_t a_task ) -{ - kthread_stop((struct task_struct *)a_task); -}