i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driver now enforces correct order of use of INIT_ACCELERANT and CLONE_ACCELERANT: baling out with B_NOT_ALLOWED if incorrect use is detected.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16019 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2006-01-21 14:49:19 +00:00
parent 923e3aaf6f
commit d1c4f04c78
1 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/nvidia/InitAccelerant.c
+25 -6
View File
@@ -4,7 +4,7 @@
Other authors: Other authors:
Mark Watson, Mark Watson,
Rudolf Cornelissen 10/2002-10/2005. Rudolf Cornelissen 10/2002-1/2006.
*/ */
#define MODULE_BIT 0x00800000 #define MODULE_BIT 0x00800000
@@ -91,7 +91,8 @@ We need to determine if the kernel driver and the accelerant are compatible.
If they are, get the accelerant ready to handle other hook functions and If they are, get the accelerant ready to handle other hook functions and
report success or failure. report success or failure.
*/ */
status_t INIT_ACCELERANT(int the_fd) { status_t INIT_ACCELERANT(int the_fd)
{
status_t result; status_t result;
int pointer_reservation; //mem reserved for pointer int pointer_reservation; //mem reserved for pointer
int cnt; //used for iteration through the overlay buffers int cnt; //used for iteration through the overlay buffers
@@ -112,6 +113,13 @@ status_t INIT_ACCELERANT(int the_fd) {
if (result != B_OK) goto error0; if (result != B_OK) goto error0;
// LOG now available: !NULL si // LOG now available: !NULL si
/* ensure that INIT_ACCELERANT is executed just once (copies should be clones) */
if (si->accelerant_in_use)
{
result = B_NOT_ALLOWED;
goto error1;
}
/* call the device specific init code */ /* call the device specific init code */
result = nv_general_powerup(); result = nv_general_powerup();
@@ -251,7 +259,8 @@ void GET_ACCELERANT_CLONE_INFO(void *data) {
Initialize a copy of the accelerant as a clone. void *data points to Initialize a copy of the accelerant as a clone. void *data points to
a copy of the data returned by GET_ACCELERANT_CLONE_INFO(). a copy of the data returned by GET_ACCELERANT_CLONE_INFO().
*/ */
status_t CLONE_ACCELERANT(void *data) { status_t CLONE_ACCELERANT(void *data)
{
status_t result; status_t result;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
@@ -283,12 +292,19 @@ status_t CLONE_ACCELERANT(void *data) {
/* call the shared initialization code */ /* call the shared initialization code */
result = init_common(fd); result = init_common(fd);
/* setup CRTC and DAC functions access */
setup_virtualized_heads(si->crtc_switch_mode);
/* bail out if the common initialization failed */ /* bail out if the common initialization failed */
if (result != B_OK) goto error1; if (result != B_OK) goto error1;
/* ensure that INIT_ACCELERANT is executed first (i.e. primary accelerant exists) */
if (!(si->accelerant_in_use))
{
result = B_NOT_ALLOWED;
goto error2;
}
/* setup CRTC and DAC functions access */
setup_virtualized_heads(si->crtc_switch_mode);
/* get shared area for display modes */ /* get shared area for display modes */
result = my_mode_list_area = clone_area( result = my_mode_list_area = clone_area(
DRIVER_PREFIX " cloned display_modes", DRIVER_PREFIX " cloned display_modes",
@@ -328,6 +344,9 @@ void UNINIT_ACCELERANT(void)
/* delete benaphores ONLY if we are the primary accelerant */ /* delete benaphores ONLY if we are the primary accelerant */
DELETE_BEN(si->engine.lock); DELETE_BEN(si->engine.lock);
DELETE_BEN(si->overlay.lock); DELETE_BEN(si->overlay.lock);
/* ensure that INIT_ACCELERANT can be executed again */
si->accelerant_in_use = false;
} }
/* free our mode list area */ /* free our mode list area */