xorg/nouveau: rename to nouveau2
PATCH 1/2 xorg/nouveau: rename to nouveau2
--- src/gallium/targets/xorg-nouveau/Makefile | 2 +- src/gallium/targets/xorg-nouveau/nouveau_xorg.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
src/gallium/targets/xorg-nouveau/Makefile +1 -1
@@ -1,7 +1,7 @@ TOP = ../../../.. include $(TOP)/configs/current -LIBNAME = modesetting_drv.so +LIBNAME = nouveau2_drv.so C_SOURCES = \ nouveau_target.c \
src/gallium/targets/xorg-nouveau/nouveau_xorg.c +7 -7
@@ -54,7 +54,7 @@ static PciChipsets nouveau_xorg_pci_devices[] = { };static XF86ModuleVersionInfo nouveau_xorg_version = { -"modesetting" , +"nouveau2" ,MODULEVENDORSTRING ,MODINFOSTRING1 ,MODINFOSTRING2 ,
@@ -70,9 +70,9 @@ static XF86ModuleVersionInfo nouveau_xorg_version = {* Xorg driver exported structures */ -_X_EXPORT DriverRec modesetting = { +_X_EXPORT DriverRec nouveau2 = {1 , -"modesetting" , +"nouveau2" , nouveau_xorg_identify,NULL , xorg_tracker_available_options,
@@ -85,7 +85,7 @@ _X_EXPORT DriverRec modesetting = {static MODULESETUPPROTO (nouveau_xorg_setup); -_X_EXPORT XF86ModuleData modesettingModuleData = { +_X_EXPORT XF86ModuleData nouveau2ModuleData = { &nouveau_xorg_version, nouveau_xorg_setup,NULL
@@ -104,7 +104,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)*/ if (!setupDone) { setupDone =1 ; -xf86AddDriver (&modesetting, module, HaveDriverFuncs); +xf86AddDriver (&nouveau2, module, HaveDriverFuncs);/* * The return value must be non-NULL on success even though there
@@ -121,7 +121,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)static void nouveau_xorg_identify (int flags) { -xf86PrintChipsets ("modesetting" ,"Driver for Modesetting Kernel Drivers" , +xf86PrintChipsets ("nouveau2" ,"Driver for Modesetting Kernel Drivers" , nouveau_xorg_chipsets); }
@@ -137,7 +137,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,if (scrn !=NULL ) { scrn->driverVersion =1 ; scrn->driverName ="nouveau" ; - scrn->name ="modesetting" ; + scrn->name ="nouveau2" ; scrn->Probe =NULL ; entity =xf86GetEntityInfo (entity_num);
Signature · 1 line
1.7.4.1
Quoted 5 lines · Marcin Slusarz
--- src/gallium/targets/xorg-nouveau/Makefile | 2 +- src/gallium/targets/xorg-nouveau/nouveau_xorg.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
ping
Quoted 73 lines · Marcin Slusarz
--- src/gallium/targets/xorg-nouveau/Makefile | 2 +- src/gallium/targets/xorg-nouveau/nouveau_xorg.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)src/gallium/targets/xorg-nouveau/Makefile +1
-1@@ -1,7 +1,7 @@ TOP = ../../../.. include $(TOP)/configs/current -LIBNAME = modesetting_drv.so +LIBNAME = nouveau2_drv.so C_SOURCES = \ nouveau_target.c \src/gallium/targets/xorg-nouveau/nouveau_xorg.c +6
-6@@ -54,7 +54,7 @@ static PciChipsets nouveau_xorg_pci_devices[] = { };static XF86ModuleVersionInfo nouveau_xorg_version = { -"modesetting" , +"nouveau2" ,MODULEVENDORSTRING ,MODINFOSTRING1 ,MODINFOSTRING2 ,@@ -70,9 +70,9 @@ static XF86ModuleVersionInfo nouveau_xorg_version = {* Xorg driver exported structures */ -_X_EXPORT DriverRec modesetting = { +_X_EXPORT DriverRec nouveau2 = {1 , -"modesetting" , +"nouveau2" , nouveau_xorg_identify,NULL , xorg_tracker_available_options,@@ -85,7 +85,7 @@ _X_EXPORT DriverRec modesetting = {static MODULESETUPPROTO (nouveau_xorg_setup); -_X_EXPORT XF86ModuleData modesettingModuleData = { +_X_EXPORT XF86ModuleData nouveau2ModuleData = { &nouveau_xorg_version, nouveau_xorg_setup,NULL @@ -104,7 +104,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)*/ if (!setupDone) { setupDone =1 ; -xf86AddDriver (&modesetting, module, HaveDriverFuncs); +xf86AddDriver (&nouveau2, module, HaveDriverFuncs);/* * The return value must be non-NULL on success even though there @@ -121,7 +121,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)static void nouveau_xorg_identify (int flags) { -xf86PrintChipsets ("modesetting" ,"Driver for Modesetting Kernel Drivers" , +xf86PrintChipsets ("nouveau2" ,"Driver for Modesetting Kernel Drivers" , nouveau_xorg_chipsets); }
src/gallium/targets/xorg-nouveau/nouveau_xorg.c nouveau_xorg_pci_probe(DriverPtr driver, · line 143
Quoted 8 lines
src/gallium/targets/xorg-nouveau/nouveau_xorg.c +1
-1@@ -137,7 +137,7 @@ nouveau_xorg_pci_probe(DriverPtr driver,if (scrn !=NULL ) { scrn->driverVersion =1 ; scrn->driverName ="nouveau" ; - scrn->name ="modesetting" ; + scrn->name ="nouveau2" ; scrn->Probe =NULL ; entity =xf86GetEntityInfo (entity_num);
Can someone commit this patch?
Marcin
Pushed, thanks.
The other patch should be pushed by someone who understands it (i.e. not me).
You already have 36 commits in Mesa master. You should really apply for an account.
Marek
Quoted 85 lines · Marcin Slusarz
Quoted 72 lines · Marcin Slusarz
---
src/gallium/targets/xorg-nouveau/Makefile | 2 +-src/gallium/targets/xorg-nouveau/nouveau_xorg.c| 14 +++++++-------2 files changed, 8 insertions(+), 8 deletions(-)src/gallium/targets/xorg-nouveau/Makefile +0
-0@@ -1,7 +1,7 @@TOP = ../../../..
include $(TOP)/configs/currentsrc/gallium/targets/xorg-nouveau/Makefile +1
-1-LIBNAME = modesetting_drv.so +LIBNAME = nouveau2_drv.soC_SOURCES = \
nouveau_target.c\src/gallium/targets/xorg-nouveau/nouveau_xorg.c +4
-4@@ -54,7 +54,7 @@ static PciChipsets nouveau_xorg_pci_devices[] = { }; static XF86ModuleVersionInfo nouveau_xorg_version = { - "modesetting", + "nouveau2", MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2,@@ -70,9 +70,9 @@ static XF86ModuleVersionInfo nouveau_xorg_version = {* Xorg driver exported structures */ -_X_EXPORT DriverRec modesetting = { +_X_EXPORT DriverRec nouveau2 = { 1, - "modesetting", + "nouveau2", nouveau_xorg_identify, NULL, xorg_tracker_available_options,@@ -85,7 +85,7 @@ _X_EXPORT DriverRec modesetting = { static MODULESETUPPROTO(nouveau_xorg_setup); -_X_EXPORT XF86ModuleData modesettingModuleData = { +_X_EXPORT XF86ModuleData nouveau2ModuleData = { &nouveau_xorg_version, nouveau_xorg_setup,NULL
src/gallium/targets/xorg-nouveau/nouveau_xorg.c +1
-1@@ -104,7 +104,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)*/ if (!setupDone) { setupDone = 1; - xf86AddDriver(&modesetting, module, HaveDriverFuncs); + xf86AddDriver(&nouveau2, module, HaveDriverFuncs); /** The return value must be non-NULL on success even though there @@ -121,7 +121,7 @@ nouveau_xorg_setup(pointer module, pointer opts, int *errmaj, int *errmin)static void
nouveau_xorg_identify(int flags)
{
- xf86PrintChipsets("modesetting", "Driver for Modesetting Kernel Drivers",
+ xf86PrintChipsets("nouveau2", "Driver for Modesetting Kernel Drivers",nouveau_xorg_chipsets);
}src/gallium/targets/xorg-nouveau/nouveau_xorg.c nouveau_xorg_pci_probe(DriverPtr driver,
Quoted 9 lines
src/gallium/targets/xorg-nouveau/nouveau_xorg.c +1
-2@@ -137,7 +137,7 @@ nouveau_xorg_pci_probe(DriverPtr driver, if (scrn != NULL) { scrn->driverVersion = 1; scrn->driverName = "nouveau"; - scrn->name = "modesetting"; + scrn->name = "nouveau2"; scrn->Probe = NULL; entity = xf86GetEntityInfo(entity_num); --Can someone commit this patch?
Quoted 7 lines
Marcin
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
A message that is not in the archive (sent off-list or not yet received): BANLkTinA+kEfe-H76HH5gNG0TXUzHahr4w-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 1 line · Marek Olšák
Pushed, thanks.
Thank you.
Quoted 4 lines
The other patch should be pushed by someone who understands it (i.e. not me).
You already have 36 commits in Mesa master. You should really apply for an account.
Ok, I will apply.
Thanks again.
Marcin
_______________________________________________
Nouveau mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/nouveau