Re: [PATCH] drm: Remove DRIVER_DATE and CORE_DATE
From: Sedat Dilek
Date: Mon Jan 03 2011 - 15:33:31 EST
2011/1/3 Pekka Paalanen <pq@xxxxxx>:
> On Wed, 22 Dec 2010 10:51:26 +0100
> Sedat Dilek <sedat.dilek@xxxxxxxxxxxxxx> wrote:
>
>> DRIVER_DATE is not maintained or upgraded on changes in many drm
>> drivers.
>>
>> For example radeon has one DRIVER_DATE for User and Kernel
>> ModeSetting driver, this makes no sense as UMS and KMS driver
>> have different versions. And of course this all increases
>> maintenance, too. For radeon it is enough to bump
>> {KMS_}DRIVER_MAJOR, {KMS_}DRIVER_MINOR and
>> {KMS_}DRIVER_PATCHLEVEL defines.
>>
>> Furthermore, I also removed CORE_DATE.
>>
>> With radeon-KMS my dmesg looks now like this:
>>
>> [ Â 12.328937] [drm] Initialized drm 1.1.0
>> [ Â 13.144019] [drm] Initialized radeon 2.8.0 for 0000:01:00.0 on
>> minor 0
>>
>> Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
>>
>> Note: Tested with radeon RV250 (KMS) and linux-next
>> (next-20101221).
> ...
>> diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
>> index bb17057..50abca3 100644
>> --- a/drivers/gpu/drm/nouveau/nouveau_drv.c
>> +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
>> @@ -416,11 +416,6 @@ static struct drm_driver driver = {
>>
>> Â Â Â .name = DRIVER_NAME,
>> Â Â Â .desc = DRIVER_DESC,
>> -#ifdef GIT_REVISION
>> - Â Â .date = GIT_REVISION,
>> -#else
>> - Â Â .date = DRIVER_DATE,
>> -#endif
>> Â Â Â .major = DRIVER_MAJOR,
>> Â Â Â .minor = DRIVER_MINOR,
>> Â Â Â .patchlevel = DRIVER_PATCHLEVEL,
>
> Just a reminder, why this hunk was there in the first place:
> it is quite usual for the Nouveau DRM to be compiled out-of-tree,
> from different kernel git sources than the hosting kernel.
> This was an attempt to record in the kernel log which exact
> revision is being used. GIT_REVISION is defined by the Makefile
> that is recommended to be used for out-of-tree building.
>
> I didn't check if this patch has been accepted, but I believe
> maintaining differences between nouveau/linux-2.6 and upstream
> kernel trees is a burden.
>
> Is there a better way to add revision information to an
> out-of-tree built kernel module?
> Or maybe this is not useful at all?
>
>
> Cheers.
>
> --
> Pekka Paalanen
> http://www.iki.fi/pq/
>
Happy new 2011 to you all (and I apologize for my rants in the next few lines)!
[ NOTE: The mentionned patch is not complete, requires further
removals also in libdrm and a rebuild of the ddx. ]
I have a new patchset (as series and as a single patch) to remove
driver-date and core-date from kernel-drm and one patch to do so for
libdrm (see attachments).
This stuff is tested and running (while I am writing to you) with
linux-next (next-20101231), a cleaned-up libdrm-2.4.23 and a rebuilt
ati/radeon ddx.
But works-for-me means not these patches work fine with other kernels,
libdrm or ddx than in my development environment.
So, please feel free to test them and give feedback (best is dri-devel
mailing-list).
( If desired I can resend the patchset/patch(es) to dri-devel ML - in
a discussion thread such patches go down. )
[ Instructions ]
1. Rebuild kernel with my kernel-drm patchset
2. Jump to the new kernel
3. Rebuild libdrm with my libdrm-patch (be aware you have the
correct/cleanedp-up drm.h)
4. Rebuild your ddx (in my case xf86-video-ati) against new libdrm
Note:
Another reason for me to get rid of the driver-date stuff: It is not
checked for example in the ddx (but for major|minor|patchlevel
versions).
BTW, my mesa and xserver are from official Debian/experimental.
Unfortunately, diverse emails of me have been unanswered to update the
driver-date for radeon (for a collection of mine see [1],[2],[3]).
I cannot speak for nouveau in kernel-drm, but the GIT version stuff
was not clear to me.
>From my POV it is the only driver having such extra-stuff and sorry
for this, it can also go to /dev/nirvana.
The version related informations for drm-core seems also not to be
lovely maintained.
How long do we see 1.1.0 as version? For ages?
Did you know about interface-version?
You found the places for DRM_IF_*?
No, this is not a riddle or quiz-show, just have a look into
<include/drm/drm_core.h>.
The IF-version (currently: v1.4) is in <drivers/gpu/drm/drm_ioctl.c>
and you will find there comments which "document" it, see
drm_setversion():
...
/*
* Version 1.1 includes tying of DRM to specific device
* Version 1.4 has proper PCI domain support
*/
...
Why the hell aren't those version mumbo-jumbos "well" documented?
By "well" I mean not deeply hided in the source-code.
I remember this version mumbo-jumbo should be in the first lines of
the driver's c-file, maintained as a history of changes.
And for the god's sake if you use hardcoded date-strings - Europeans
like me still get confused by 01/11/2010 (is it 01-Nov-2010 or
11-Jan-2010?) - why don't you use a clear 10-Oct-2010 (here:
drm-vblank-timestamping):
$ dmesg | grep vblank
[ 10.359312] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010).
[ 10.359349] [drm] Driver supports precise vblank timestamp query.
Also for drm-vblank-timestamping:
Is your Rev and date still valid, where is it documented? Source-code?
In general, do you see drm-related docs in Documentation directory of
the linux-kernel (see [3] for linux-next)?
Why?
Did you had a look at the author's names in the diverse header and
c-files in the kernel-drm tree?
Maintained or not maintained, this is here the question :-)?
It is a logical and correct consequence to remove such version crap if
it is not 1. properly documented or 2. well maintained.
As an example see linux-wireless mailing-list and the removal of
module-version of ath5k-driver (see [5],[6]).
When you want to throw off the date-related stuff completely from the
whole(!) kernel-drm tree, you have to do appropriate removals in
libdrm.
The only argument I can understand is a breakage of the drm ABI.
Anyway, the world won't stop turning by these changes.
Now, there is a reason to bump the core-version with driver-date and
core-date removal :-)?
diff --git a/include/drm/drm_core.h b/include/drm/drm_core.h
index 1485f3f..d54449e 100644
--- a/include/drm/drm_core.h
+++ b/include/drm/drm_core.h
@@ -29,5 +29,5 @@
#define DRM_IF_MINOR 4
#define CORE_MAJOR 1
-#define CORE_MINOR 1
+#define CORE_MINOR 2
#define CORE_PATCHLEVEL 0
Aaargh, where shall I document this core-version bump?
In the git commit? As usual: Documentation is seen as a punishment for coders?
Dear developers, if you don't maintain your drivers with version *and
date*, then please kill the latter.
Last but not least:
Is there an official recommendation (written down docs) about how to
maintain driver documentation?
An excellent example of a driver or even for a sub-tree of the kernel.
Thanks in advance.
With this email I want to call the attention of the drm developers to
my removal request.
As you know the kernel got rid also of the firmware stuff (it took some time).
Speaking as an end-user, I did all efforts to change the circumstance
by pointing to the problem in IRC and MLs.
"Laziness" is not an argument to me.
RIP driver-date and core-date (I won't drop a tear for you).
Regards,
- Sedat -
[1] http://www.mail-archive.com/dri-devel@xxxxxxxxxxxxxxxxxxxxx/msg00117.html
[2] http://www.mail-archive.com/dri-devel@xxxxxxxxxxxxxxxxxxxxx/msg00121.html
[3] http://www.mail-archive.com/dri-devel@xxxxxxxxxxxxxxxxxxxxx/msg00125.html
[4] http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=tree;f=Documentation
[5] http://marc.info/?t=129134950900001&r=1&w=4
[6] http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=b7555ec7c604f2f00e432579dac29df5ce525433
From 18b7f49f7c66cc4be47554d3a8bd64bca86a5e4c Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Sun, 2 Jan 2011 00:18:57 +0100
Subject: [PATCH 1/4] drm: Remove DRIVER_DATE from drm drivers
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
drivers/gpu/drm/drm_drv.c | 1 -
drivers/gpu/drm/i810/i810_drv.c | 1 -
drivers/gpu/drm/i810/i810_drv.h | 1 -
drivers/gpu/drm/i830/i830_drv.c | 1 -
drivers/gpu/drm/i830/i830_drv.h | 1 -
drivers/gpu/drm/i915/i915_drv.c | 1 -
drivers/gpu/drm/i915/i915_drv.h | 1 -
drivers/gpu/drm/mga/mga_drv.c | 1 -
drivers/gpu/drm/mga/mga_drv.h | 1 -
drivers/gpu/drm/nouveau/nouveau_drv.c | 5 -----
drivers/gpu/drm/nouveau/nouveau_drv.h | 1 -
drivers/gpu/drm/r128/r128_drv.c | 1 -
drivers/gpu/drm/r128/r128_drv.h | 1 -
drivers/gpu/drm/radeon/radeon_drv.c | 2 --
drivers/gpu/drm/radeon/radeon_drv.h | 1 -
drivers/gpu/drm/savage/savage_drv.c | 1 -
drivers/gpu/drm/savage/savage_drv.h | 1 -
drivers/gpu/drm/sis/sis_drv.c | 1 -
drivers/gpu/drm/sis/sis_drv.h | 1 -
drivers/gpu/drm/tdfx/tdfx_drv.c | 1 -
drivers/gpu/drm/tdfx/tdfx_drv.h | 1 -
drivers/gpu/drm/via/via_drv.c | 1 -
drivers/gpu/drm/via/via_drv.h | 1 -
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 -
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
25 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 271835a..ce0741a 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -13,7 +13,6 @@
*
* #define DRIVER_NAME "mga"
* #define DRIVER_DESC "Matrox G200/G400"
- * #define DRIVER_DATE "20001127"
*
* #define drm_x mga_##x
* \endcode
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 0152fa2..a0f2b0c 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -71,7 +71,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index c9339f4..3005c99 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -39,7 +39,6 @@
#define DRIVER_NAME "i810"
#define DRIVER_DESC "Intel i810"
-#define DRIVER_DATE "20030605"
/* Interface history
*
diff --git a/drivers/gpu/drm/i830/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index f655ab7..832aa32 100644
--- a/drivers/gpu/drm/i830/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
@@ -82,7 +82,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
index 0df1c72..61127e8 100644
--- a/drivers/gpu/drm/i830/i830_drv.h
+++ b/drivers/gpu/drm/i830/i830_drv.h
@@ -39,7 +39,6 @@
#define DRIVER_NAME "i830"
#define DRIVER_DESC "Intel 830M"
-#define DRIVER_DATE "20021108"
/* Interface history:
*
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9eee6cf..379b1bd 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -694,7 +694,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index aac1bf3..dd7895c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -44,7 +44,6 @@
#define DRIVER_NAME "i915"
#define DRIVER_DESC "Intel Graphics"
-#define DRIVER_DATE "20080730"
enum pipe {
PIPE_A = 0,
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 0aaf5f6..95622f2 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -82,7 +82,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index 1084fa4..6bdcb14 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -38,7 +38,6 @@
#define DRIVER_NAME "mga"
#define DRIVER_DESC "Matrox G200/G400"
-#define DRIVER_DATE "20051102"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 2
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index bb17057..50abca3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -416,11 +416,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
-#ifdef GIT_REVISION
- .date = GIT_REVISION,
-#else
- .date = DRIVER_DATE,
-#endif
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index e815756..96b6d61 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -30,7 +30,6 @@
#define DRIVER_NAME "nouveau"
#define DRIVER_DESC "nVidia Riva/TNT/GeForce"
-#define DRIVER_DATE "20090420"
#define DRIVER_MAJOR 0
#define DRIVER_MINOR 0
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 18c3c71..9d76997 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -78,7 +78,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 930c71b2..32bf088 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -41,7 +41,6 @@
#define DRIVER_NAME "r128"
#define DRIVER_DESC "ATI Rage 128"
-#define DRIVER_DATE "20030725"
/* Interface history:
*
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 18225f2..5ae78a5 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -231,7 +231,6 @@ static struct drm_driver driver_old = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
@@ -343,7 +342,6 @@ static struct drm_driver kms_driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = KMS_DRIVER_MAJOR,
.minor = KMS_DRIVER_MINOR,
.patchlevel = KMS_DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 448eba8..de2dd78 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -43,7 +43,6 @@
#define DRIVER_NAME "radeon"
#define DRIVER_DESC "ATI Radeon"
-#define DRIVER_DATE "20080528"
/* Interface history:
*
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index fa64d25..a02c9da 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -62,7 +62,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
index df2aac6..89f1b71 100644
--- a/drivers/gpu/drm/savage/savage_drv.h
+++ b/drivers/gpu/drm/savage/savage_drv.h
@@ -30,7 +30,6 @@
#define DRIVER_NAME "savage"
#define DRIVER_DESC "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]"
-#define DRIVER_DATE "20050313"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 4
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4caf5d0..dd7366d 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -89,7 +89,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index ef940ba..d285196 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -34,7 +34,6 @@
#define DRIVER_AUTHOR "SIS, Tungsten Graphics"
#define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540 and XGI V3XE/V5/V8"
-#define DRIVER_DATE "20070626"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 3
#define DRIVER_PATCHLEVEL 0
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index b70fa91..aef0a96 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -59,7 +59,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.h b/drivers/gpu/drm/tdfx/tdfx_drv.h
index 84204ec..84923a2 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.h
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.h
@@ -38,7 +38,6 @@
#define DRIVER_NAME "tdfx"
#define DRIVER_DESC "3dfx Banshee/Voodoo3+"
-#define DRIVER_DATE "20010216"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 0
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index e1ff4e7..a32693d 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -69,7 +69,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 9cf87d9..8d7f4d2 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -29,7 +29,6 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
-#define DRIVER_DATE "20070202"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 11
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 10ca97e..b2d7ccd 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -920,7 +920,6 @@ static struct drm_driver driver = {
},
.name = VMWGFX_DRIVER_NAME,
.desc = VMWGFX_DRIVER_DESC,
- .date = VMWGFX_DRIVER_DATE,
.major = VMWGFX_DRIVER_MAJOR,
.minor = VMWGFX_DRIVER_MINOR,
.patchlevel = VMWGFX_DRIVER_PATCHLEVEL
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 10fc01f..9ad19e0 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -39,7 +39,6 @@
#include "ttm/ttm_execbuf_util.h"
#include "ttm/ttm_module.h"
-#define VMWGFX_DRIVER_DATE "20100927"
#define VMWGFX_DRIVER_MAJOR 1
#define VMWGFX_DRIVER_MINOR 4
#define VMWGFX_DRIVER_PATCHLEVEL 0
--
1.7.4.rc0
From 67704679623b8757750e13b964111b6cb4b552cf Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Sun, 2 Jan 2011 00:19:44 +0100
Subject: [PATCH 2/4] drm: Remove CORE_DATE from drm-core and drm-sysfs
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
drivers/gpu/drm/drm_sysfs.c | 3 +--
include/drm/drm_core.h | 1 -
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 85da4c4..1976743 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -80,8 +80,7 @@ static CLASS_ATTR_STRING(version, S_IRUGO,
CORE_NAME " "
__stringify(CORE_MAJOR) "."
__stringify(CORE_MINOR) "."
- __stringify(CORE_PATCHLEVEL) " "
- CORE_DATE);
+ __stringify(CORE_PATCHLEVEL) " ");
/**
* drm_sysfs_create - create a struct drm_sysfs_class structure
diff --git a/include/drm/drm_core.h b/include/drm/drm_core.h
index 4e75238..1485f3f 100644
--- a/include/drm/drm_core.h
+++ b/include/drm/drm_core.h
@@ -24,7 +24,6 @@
#define CORE_NAME "drm"
#define CORE_DESC "DRM shared core routines"
-#define CORE_DATE "20060810"
#define DRM_IF_MAJOR 1
#define DRM_IF_MINOR 4
--
1.7.4.rc0
From d527fd57683e6373d70988f35c46ee798210668e Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Sun, 2 Jan 2011 00:20:07 +0100
Subject: [PATCH 3/4] drm: Fix DRM_INFO() after DRIVER_DATE/CORE_DATE removal
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
drivers/gpu/drm/drm_drv.c | 4 ++--
drivers/gpu/drm/drm_pci.c | 4 ++--
drivers/gpu/drm/drm_platform.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index ce0741a..89d958c 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -314,8 +314,8 @@ static int __init drm_core_init(void)
goto err_p3;
}
- DRM_INFO("Initialized %s %d.%d.%d %s\n",
- CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
+ DRM_INFO("Initialized %s %d.%d.%d\n",
+ CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL);
return 0;
err_p3:
drm_sysfs_destroy();
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index f5bd9e5..c14cc0e 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -197,9 +197,9 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
list_add_tail(&dev->driver_item, &driver->device_list);
- DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
+ DRM_INFO("Initialized %s %d.%d.%d for %s on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
- driver->date, pci_name(pdev), dev->primary->index);
+ pci_name(pdev), dev->primary->index);
mutex_unlock(&drm_global_mutex);
return 0;
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 92d1d0f..9691f8a 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -91,9 +91,9 @@ int drm_get_platform_dev(struct platform_device *platdev,
mutex_unlock(&drm_global_mutex);
- DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+ DRM_INFO("Initialized %s %d.%d.%d on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
- driver->date, dev->primary->index);
+ dev->primary->index);
return 0;
--
1.7.4.rc0
From 18c9f8936e315e0def01923144d49099834e6876 Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Sun, 2 Jan 2011 00:20:56 +0100
Subject: [PATCH 4/4] drm: Remove date_len and date from drm_version()
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
drivers/gpu/drm/drm_drv.c | 3 ---
include/drm/drm.h | 2 --
2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 89d958c..7d221bb 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -388,9 +388,6 @@ static int drm_version(struct drm_device *dev, void *data,
err = drm_copy_field(version->name, &version->name_len,
dev->driver->name);
if (!err)
- err = drm_copy_field(version->date, &version->date_len,
- dev->driver->date);
- if (!err)
err = drm_copy_field(version->desc, &version->desc_len,
dev->driver->desc);
diff --git a/include/drm/drm.h b/include/drm/drm.h
index e5f7061..031a3c4 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -131,8 +131,6 @@ struct drm_version {
int version_patchlevel; /**< Patch level */
size_t name_len; /**< Length of name buffer */
char __user *name; /**< Name of driver */
- size_t date_len; /**< Length of date buffer */
- char __user *date; /**< User-space buffer to hold date */
size_t desc_len; /**< Length of desc buffer */
char __user *desc; /**< User-space buffer to hold desc */
};
--
1.7.4.rc0
Sedat Dilek (4):
drm: Remove DRIVER_DATE from drm drivers
drm: Remove CORE_DATE from drm-core and drm-sysfs
drm: Fix DRM_INFO() after DRIVER_DATE/CORE_DATE removal
drm: Remove date_len and date from drm_version()
drivers/gpu/drm/drm_drv.c | 8 ++------
drivers/gpu/drm/drm_pci.c | 4 ++--
drivers/gpu/drm/drm_platform.c | 4 ++--
drivers/gpu/drm/drm_sysfs.c | 3 +--
drivers/gpu/drm/i810/i810_drv.c | 1 -
drivers/gpu/drm/i810/i810_drv.h | 1 -
drivers/gpu/drm/i830/i830_drv.c | 1 -
drivers/gpu/drm/i830/i830_drv.h | 1 -
drivers/gpu/drm/i915/i915_drv.c | 1 -
drivers/gpu/drm/i915/i915_drv.h | 1 -
drivers/gpu/drm/mga/mga_drv.c | 1 -
drivers/gpu/drm/mga/mga_drv.h | 1 -
drivers/gpu/drm/nouveau/nouveau_drv.c | 5 -----
drivers/gpu/drm/nouveau/nouveau_drv.h | 1 -
drivers/gpu/drm/r128/r128_drv.c | 1 -
drivers/gpu/drm/r128/r128_drv.h | 1 -
drivers/gpu/drm/radeon/radeon_drv.c | 2 --
drivers/gpu/drm/radeon/radeon_drv.h | 1 -
drivers/gpu/drm/savage/savage_drv.c | 1 -
drivers/gpu/drm/savage/savage_drv.h | 1 -
drivers/gpu/drm/sis/sis_drv.c | 1 -
drivers/gpu/drm/sis/sis_drv.h | 1 -
drivers/gpu/drm/tdfx/tdfx_drv.c | 1 -
drivers/gpu/drm/tdfx/tdfx_drv.h | 1 -
drivers/gpu/drm/via/via_drv.c | 1 -
drivers/gpu/drm/via/via_drv.h | 1 -
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 -
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 -
include/drm/drm.h | 2 --
include/drm/drm_core.h | 1 -
30 files changed, 7 insertions(+), 44 deletions(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 271835a..7d221bb 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -13,7 +13,6 @@
*
* #define DRIVER_NAME "mga"
* #define DRIVER_DESC "Matrox G200/G400"
- * #define DRIVER_DATE "20001127"
*
* #define drm_x mga_##x
* \endcode
@@ -315,8 +314,8 @@ static int __init drm_core_init(void)
goto err_p3;
}
- DRM_INFO("Initialized %s %d.%d.%d %s\n",
- CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL, CORE_DATE);
+ DRM_INFO("Initialized %s %d.%d.%d\n",
+ CORE_NAME, CORE_MAJOR, CORE_MINOR, CORE_PATCHLEVEL);
return 0;
err_p3:
drm_sysfs_destroy();
@@ -389,9 +388,6 @@ static int drm_version(struct drm_device *dev, void *data,
err = drm_copy_field(version->name, &version->name_len,
dev->driver->name);
if (!err)
- err = drm_copy_field(version->date, &version->date_len,
- dev->driver->date);
- if (!err)
err = drm_copy_field(version->desc, &version->desc_len,
dev->driver->desc);
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index f5bd9e5..c14cc0e 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -197,9 +197,9 @@ int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
list_add_tail(&dev->driver_item, &driver->device_list);
- DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n",
+ DRM_INFO("Initialized %s %d.%d.%d for %s on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
- driver->date, pci_name(pdev), dev->primary->index);
+ pci_name(pdev), dev->primary->index);
mutex_unlock(&drm_global_mutex);
return 0;
diff --git a/drivers/gpu/drm/drm_platform.c b/drivers/gpu/drm/drm_platform.c
index 92d1d0f..9691f8a 100644
--- a/drivers/gpu/drm/drm_platform.c
+++ b/drivers/gpu/drm/drm_platform.c
@@ -91,9 +91,9 @@ int drm_get_platform_dev(struct platform_device *platdev,
mutex_unlock(&drm_global_mutex);
- DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
+ DRM_INFO("Initialized %s %d.%d.%d on minor %d\n",
driver->name, driver->major, driver->minor, driver->patchlevel,
- driver->date, dev->primary->index);
+ dev->primary->index);
return 0;
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index 85da4c4..1976743 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -80,8 +80,7 @@ static CLASS_ATTR_STRING(version, S_IRUGO,
CORE_NAME " "
__stringify(CORE_MAJOR) "."
__stringify(CORE_MINOR) "."
- __stringify(CORE_PATCHLEVEL) " "
- CORE_DATE);
+ __stringify(CORE_PATCHLEVEL) " ");
/**
* drm_sysfs_create - create a struct drm_sysfs_class structure
diff --git a/drivers/gpu/drm/i810/i810_drv.c b/drivers/gpu/drm/i810/i810_drv.c
index 0152fa2..a0f2b0c 100644
--- a/drivers/gpu/drm/i810/i810_drv.c
+++ b/drivers/gpu/drm/i810/i810_drv.c
@@ -71,7 +71,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
index c9339f4..3005c99 100644
--- a/drivers/gpu/drm/i810/i810_drv.h
+++ b/drivers/gpu/drm/i810/i810_drv.h
@@ -39,7 +39,6 @@
#define DRIVER_NAME "i810"
#define DRIVER_DESC "Intel i810"
-#define DRIVER_DATE "20030605"
/* Interface history
*
diff --git a/drivers/gpu/drm/i830/i830_drv.c b/drivers/gpu/drm/i830/i830_drv.c
index f655ab7..832aa32 100644
--- a/drivers/gpu/drm/i830/i830_drv.c
+++ b/drivers/gpu/drm/i830/i830_drv.c
@@ -82,7 +82,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
index 0df1c72..61127e8 100644
--- a/drivers/gpu/drm/i830/i830_drv.h
+++ b/drivers/gpu/drm/i830/i830_drv.h
@@ -39,7 +39,6 @@
#define DRIVER_NAME "i830"
#define DRIVER_DESC "Intel 830M"
-#define DRIVER_DATE "20021108"
/* Interface history:
*
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 9eee6cf..379b1bd 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -694,7 +694,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index aac1bf3..dd7895c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -44,7 +44,6 @@
#define DRIVER_NAME "i915"
#define DRIVER_DESC "Intel Graphics"
-#define DRIVER_DATE "20080730"
enum pipe {
PIPE_A = 0,
diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c
index 0aaf5f6..95622f2 100644
--- a/drivers/gpu/drm/mga/mga_drv.c
+++ b/drivers/gpu/drm/mga/mga_drv.c
@@ -82,7 +82,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index 1084fa4..6bdcb14 100644
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -38,7 +38,6 @@
#define DRIVER_NAME "mga"
#define DRIVER_DESC "Matrox G200/G400"
-#define DRIVER_DATE "20051102"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 2
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index bb17057..50abca3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -416,11 +416,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
-#ifdef GIT_REVISION
- .date = GIT_REVISION,
-#else
- .date = DRIVER_DATE,
-#endif
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index e815756..96b6d61 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -30,7 +30,6 @@
#define DRIVER_NAME "nouveau"
#define DRIVER_DESC "nVidia Riva/TNT/GeForce"
-#define DRIVER_DATE "20090420"
#define DRIVER_MAJOR 0
#define DRIVER_MINOR 0
diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
index 18c3c71..9d76997 100644
--- a/drivers/gpu/drm/r128/r128_drv.c
+++ b/drivers/gpu/drm/r128/r128_drv.c
@@ -78,7 +78,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
index 930c71b2..32bf088 100644
--- a/drivers/gpu/drm/r128/r128_drv.h
+++ b/drivers/gpu/drm/r128/r128_drv.h
@@ -41,7 +41,6 @@
#define DRIVER_NAME "r128"
#define DRIVER_DESC "ATI Rage 128"
-#define DRIVER_DATE "20030725"
/* Interface history:
*
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 18225f2..5ae78a5 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -231,7 +231,6 @@ static struct drm_driver driver_old = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
@@ -343,7 +342,6 @@ static struct drm_driver kms_driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = KMS_DRIVER_MAJOR,
.minor = KMS_DRIVER_MINOR,
.patchlevel = KMS_DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 448eba8..de2dd78 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -43,7 +43,6 @@
#define DRIVER_NAME "radeon"
#define DRIVER_DESC "ATI Radeon"
-#define DRIVER_DATE "20080528"
/* Interface history:
*
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c
index fa64d25..a02c9da 100644
--- a/drivers/gpu/drm/savage/savage_drv.c
+++ b/drivers/gpu/drm/savage/savage_drv.c
@@ -62,7 +62,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/savage/savage_drv.h b/drivers/gpu/drm/savage/savage_drv.h
index df2aac6..89f1b71 100644
--- a/drivers/gpu/drm/savage/savage_drv.h
+++ b/drivers/gpu/drm/savage/savage_drv.h
@@ -30,7 +30,6 @@
#define DRIVER_NAME "savage"
#define DRIVER_DESC "Savage3D/MX/IX, Savage4, SuperSavage, Twister, ProSavage[DDR]"
-#define DRIVER_DATE "20050313"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 4
diff --git a/drivers/gpu/drm/sis/sis_drv.c b/drivers/gpu/drm/sis/sis_drv.c
index 4caf5d0..dd7366d 100644
--- a/drivers/gpu/drm/sis/sis_drv.c
+++ b/drivers/gpu/drm/sis/sis_drv.c
@@ -89,7 +89,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/sis/sis_drv.h b/drivers/gpu/drm/sis/sis_drv.h
index ef940ba..d285196 100644
--- a/drivers/gpu/drm/sis/sis_drv.h
+++ b/drivers/gpu/drm/sis/sis_drv.h
@@ -34,7 +34,6 @@
#define DRIVER_AUTHOR "SIS, Tungsten Graphics"
#define DRIVER_NAME "sis"
#define DRIVER_DESC "SIS 300/630/540 and XGI V3XE/V5/V8"
-#define DRIVER_DATE "20070626"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 3
#define DRIVER_PATCHLEVEL 0
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.c b/drivers/gpu/drm/tdfx/tdfx_drv.c
index b70fa91..aef0a96 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.c
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.c
@@ -59,7 +59,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/tdfx/tdfx_drv.h b/drivers/gpu/drm/tdfx/tdfx_drv.h
index 84204ec..84923a2 100644
--- a/drivers/gpu/drm/tdfx/tdfx_drv.h
+++ b/drivers/gpu/drm/tdfx/tdfx_drv.h
@@ -38,7 +38,6 @@
#define DRIVER_NAME "tdfx"
#define DRIVER_DESC "3dfx Banshee/Voodoo3+"
-#define DRIVER_DATE "20010216"
#define DRIVER_MAJOR 1
#define DRIVER_MINOR 0
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index e1ff4e7..a32693d 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -69,7 +69,6 @@ static struct drm_driver driver = {
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
- .date = DRIVER_DATE,
.major = DRIVER_MAJOR,
.minor = DRIVER_MINOR,
.patchlevel = DRIVER_PATCHLEVEL,
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 9cf87d9..8d7f4d2 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -29,7 +29,6 @@
#define DRIVER_NAME "via"
#define DRIVER_DESC "VIA Unichrome / Pro"
-#define DRIVER_DATE "20070202"
#define DRIVER_MAJOR 2
#define DRIVER_MINOR 11
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 10ca97e..b2d7ccd 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -920,7 +920,6 @@ static struct drm_driver driver = {
},
.name = VMWGFX_DRIVER_NAME,
.desc = VMWGFX_DRIVER_DESC,
- .date = VMWGFX_DRIVER_DATE,
.major = VMWGFX_DRIVER_MAJOR,
.minor = VMWGFX_DRIVER_MINOR,
.patchlevel = VMWGFX_DRIVER_PATCHLEVEL
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 10fc01f..9ad19e0 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -39,7 +39,6 @@
#include "ttm/ttm_execbuf_util.h"
#include "ttm/ttm_module.h"
-#define VMWGFX_DRIVER_DATE "20100927"
#define VMWGFX_DRIVER_MAJOR 1
#define VMWGFX_DRIVER_MINOR 4
#define VMWGFX_DRIVER_PATCHLEVEL 0
diff --git a/include/drm/drm.h b/include/drm/drm.h
index e5f7061..031a3c4 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -131,8 +131,6 @@ struct drm_version {
int version_patchlevel; /**< Patch level */
size_t name_len; /**< Length of name buffer */
char __user *name; /**< Name of driver */
- size_t date_len; /**< Length of date buffer */
- char __user *date; /**< User-space buffer to hold date */
size_t desc_len; /**< Length of desc buffer */
char __user *desc; /**< User-space buffer to hold desc */
};
diff --git a/include/drm/drm_core.h b/include/drm/drm_core.h
index 4e75238..1485f3f 100644
--- a/include/drm/drm_core.h
+++ b/include/drm/drm_core.h
@@ -24,7 +24,6 @@
#define CORE_NAME "drm"
#define CORE_DESC "DRM shared core routines"
-#define CORE_DATE "20060810"
#define DRM_IF_MAJOR 1
#define DRM_IF_MINOR 4
From c105fc3384ed411d92bb70f0cc54b38880d4d06d Mon Sep 17 00:00:00 2001
From: Sedat Dilek <sedat.dilek@xxxxxxxxx>
Date: Sat, 1 Jan 2011 21:17:30 +0100
Subject: [PATCH] libdrm: Remove driver date from drm version calls
Signed-off-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
---
include/drm/drm.h | 2 --
tests/dristat.c | 1 -
tests/drmstat.c | 1 -
tests/getversion.c | 1 -
xf86drm.c | 9 ---------
xf86drm.h | 2 --
6 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/include/drm/drm.h b/include/drm/drm.h
index 2ba7136..dac510a 100644
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
@@ -131,8 +131,6 @@ struct drm_version {
int version_patchlevel; /**< Patch level */
size_t name_len; /**< Length of name buffer */
char *name; /**< Name of driver */
- size_t date_len; /**< Length of date buffer */
- char *date; /**< User-space buffer to hold date */
size_t desc_len; /**< Length of desc buffer */
char *desc; /**< User-space buffer to hold desc */
};
diff --git a/tests/dristat.c b/tests/dristat.c
index 900a3e6..e493c83 100644
--- a/tests/dristat.c
+++ b/tests/dristat.c
@@ -53,7 +53,6 @@ static void getversion(int fd)
version->version_major,
version->version_minor,
version->version_patchlevel);
- printf(" Date: %s\n", version->date ? version->date : "?");
printf(" Desc: %s\n", version->desc ? version->desc : "?");
drmFreeVersion(version);
} else {
diff --git a/tests/drmstat.c b/tests/drmstat.c
index 345b8d2..3250d2c 100644
--- a/tests/drmstat.c
+++ b/tests/drmstat.c
@@ -72,7 +72,6 @@ static void getversion(int fd)
version->version_major,
version->version_minor,
version->version_patchlevel );
- printf( " Date: %s\n", version->date ? version->date : "?" );
printf( " Desc: %s\n", version->desc ? version->desc : "?" );
drmFreeVersion(version);
} else {
diff --git a/tests/getversion.c b/tests/getversion.c
index 711d376..82084b7 100644
--- a/tests/getversion.c
+++ b/tests/getversion.c
@@ -38,7 +38,6 @@ int main(int argc, char **argv)
fd = drm_open_any();
v = drmGetVersion(fd);
assert(strlen(v->name) != 0);
- assert(strlen(v->date) != 0);
assert(strlen(v->desc) != 0);
if (strcmp(v->name, "i915") == 0)
assert(v->version_major >= 1);
diff --git a/xf86drm.c b/xf86drm.c
index 799fcdd..81a8a39 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -669,7 +669,6 @@ void drmFreeVersion(drmVersionPtr v)
if (!v)
return;
drmFree(v->name);
- drmFree(v->date);
drmFree(v->desc);
drmFree(v);
}
@@ -689,7 +688,6 @@ static void drmFreeKernelVersion(drm_version_t *v)
if (!v)
return;
drmFree(v->name);
- drmFree(v->date);
drmFree(v->desc);
drmFree(v);
}
@@ -712,8 +710,6 @@ static void drmCopyVersion(drmVersionPtr d, const drm_version_t *s)
d->version_patchlevel = s->version_patchlevel;
d->name_len = s->name_len;
d->name = strdup(s->name);
- d->date_len = s->date_len;
- d->date = strdup(s->date);
d->desc_len = s->desc_len;
d->desc = strdup(s->desc);
}
@@ -741,8 +737,6 @@ drmVersionPtr drmGetVersion(int fd)
version->name_len = 0;
version->name = NULL;
- version->date_len = 0;
- version->date = NULL;
version->desc_len = 0;
version->desc = NULL;
@@ -753,8 +747,6 @@ drmVersionPtr drmGetVersion(int fd)
if (version->name_len)
version->name = drmMalloc(version->name_len + 1);
- if (version->date_len)
- version->date = drmMalloc(version->date_len + 1);
if (version->desc_len)
version->desc = drmMalloc(version->desc_len + 1);
@@ -766,7 +758,6 @@ drmVersionPtr drmGetVersion(int fd)
/* The results might not be null-terminated strings, so terminate them. */
if (version->name_len) version->name[version->name_len] = '\0';
- if (version->date_len) version->date[version->date_len] = '\0';
if (version->desc_len) version->desc[version->desc_len] = '\0';
retval = drmMalloc(sizeof(*retval));
diff --git a/xf86drm.h b/xf86drm.h
index 9b89f56..afbd819 100644
--- a/xf86drm.h
+++ b/xf86drm.h
@@ -115,8 +115,6 @@ typedef struct _drmVersion {
int version_patchlevel; /**< Patch level */
int name_len; /**< Length of name buffer */
char *name; /**< Name of driver */
- int date_len; /**< Length of date buffer */
- char *date; /**< User-space buffer to hold date */
int desc_len; /**< Length of desc buffer */
char *desc; /**< User-space buffer to hold desc */
} drmVersion, *drmVersionPtr;
--
1.7.4.rc0