Patchwork [v2,4/4] dix: Delete mibstore.h

login
register
mail settings
Submitter Daniel Martin
Date Sept. 5, 2012, 10:38 p.m.
Message ID <1346884706-18803-5-git-send-email-consume.noise@gmail.com>
Download mbox | patch
Permalink /patch/11940/
State Accepted
Commit 1cb0261ef54b7dd6a7ef84e1c3959e424706228b
Headers show

Comments

Daniel Martin - Sept. 5, 2012, 10:38 p.m.
Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to
define an empty function (miInitializeBackingStore()) for backward
compatibility. Time to say goodbye.
---
 mi/Makefile.am |  3 +--
 mi/mibstore.h  | 23 -----------------------
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 mi/mibstore.h
Aaron Plattner - Sept. 10, 2012, 4:26 p.m.
Fine with us, since our driver won't call miInitializeBackingStore on ABIs > 8, but I think other drivers need to be fixed before this goes in:

mesa/mesa/src/gallium/state_trackers/xorg/xorg_driver.c:855:    miInitializeBackingStore(pScreen);
driver/xf86-video-tdfx/src/tdfx_driver.c:2376:  miInitializeBackingStore(pScreen);
driver/xf86-video-sis/src/sis_driver.c:8886:    miInitializeBackingStore(pScreen);
driver/xf86-video-cirrus/src/lg_driver.c:1376:	miInitializeBackingStore(pScreen);
driver/xf86-video-cirrus/src/alp_driver.c:1620:	miInitializeBackingStore(pScreen);
driver/xf86-video-xgixp/src/xgi_driver.c:2045:    miInitializeBackingStore(pScreen);
driver/xf86-video-fbdev/src/fbdev.c:848:	miInitializeBackingStore(pScreen);
driver/xf86-video-s3/src/s3_driver.c:825:        miInitializeBackingStore(pScreen);
driver/xf86-video-apm/src/apm_driver.c:1787:    miInitializeBackingStore(pScreen);
driver/xf86-video-ati/src/radeon_kms.c:1221:    miInitializeBackingStore(pScreen);
driver/xf86-video-voodoo/src/voodoo_driver.c:683:  miInitializeBackingStore(pScreen);
driver/xf86-video-ark/src/ark_driver.c:541:	miInitializeBackingStore(pScreen);
driver/xf86-video-mach64/src/atiscreen.c:545:    miInitializeBackingStore(pScreen);
driver/xf86-video-glint/src/glint_driver.c:2907:    miInitializeBackingStore(pScreen);
driver/xf86-video-chips/src/ct_driver.c:4148:	miInitializeBackingStore(pScreen);
driver/xf86-video-chips/src/ct_driver.c:4299:	miInitializeBackingStore(pScreen);
driver/xf86-video-tga/src/tga_driver.c:1454:    miInitializeBackingStore(pScreen);
driver/xf86-video-dummy/src/dummy_driver.c:620:    miInitializeBackingStore(pScreen);
driver/xf86-video-i128/src/i128_driver.c:1559:    miInitializeBackingStore(pScreen);
driver/xf86-video-sisusb/src/sisusb_driver.c:1910:    miInitializeBackingStore(pScreen);
driver/xf86-video-siliconmotion/src/smi_driver.c:1753:    miInitializeBackingStore(pScreen);
driver/xf86-video-savage/src/savage_driver.c:3411:    miInitializeBackingStore(pScreen);
driver/xf86-video-r128/src/r128_driver.c:2699:    miInitializeBackingStore(pScreen);
driver/xf86-video-vesa/src/vesa.c:1084:    miInitializeBackingStore(pScreen);
driver/xf86-video-nv/src/g80_driver.c:836:    miInitializeBackingStore(pScreen);
driver/xf86-video-nv/src/nv_driver.c:2553:    miInitializeBackingStore(pScreen);
driver/xf86-video-nv/src/riva_driver.c:1171:    miInitializeBackingStore(pScreen);
driver/xf86-video-s3virge/src/s3v_driver.c:2423:  miInitializeBackingStore(pScreen);
driver/xf86-video-vmware/src/vmware.c:1486:    miInitializeBackingStore(pScreen);
driver/xf86-video-vmware/vmwgfx/vmwgfx_driver.c:1039:    miInitializeBackingStore(pScreen);
driver/xf86-video-ast/src/ast_driver.c:891:   miInitializeBackingStore(pScreen);
driver/xf86-video-mga/src/mga_driver.c:3411:    miInitializeBackingStore(pScreen);
driver/xf86-video-newport/src/newport_driver.c:540:	miInitializeBackingStore(pScreen);
driver/xf86-video-i740/src/i740_driver.c:1561:  miInitializeBackingStore(pScreen);
driver/xf86-video-sunffb/src/ffb_driver.c:765:    miInitializeBackingStore(pScreen);
driver/xf86-video-neomagic/src/neo_driver.c:1624:    miInitializeBackingStore(pScreen);
driver/xf86-video-tseng/src/tseng_driver.c:1456:    miInitializeBackingStore(pScreen);
driver/xf86-video-rendition/src/rendition.c:1176:    miInitializeBackingStore(pScreen);
driver/xf86-video-trident/src/trident_driver.c:3040:    miInitializeBackingStore(pScreen);
driver/xf86-video-intel/src/legacy/i810/i810_driver.c:1678:   miInitializeBackingStore(screen);
driver/xf86-video-intel/src/sna/sna_driver.c:887:	miInitializeBackingStore(screen);
driver/xf86-video-intel/src/intel_driver.c:962:	miInitializeBackingStore(screen);

Some of these are important, so
Nacked-by: Aaron Plattner <aplattner@nvidia.com>

-- Aaron

On 09/05/2012 03:38 PM, Daniel Martin wrote:
> Since Nov 2010 (commit c4c4676) the only purpose of mibstore.h was to
> define an empty function (miInitializeBackingStore()) for backward
> compatibility. Time to say goodbye.
> ---
>   mi/Makefile.am |  3 +--
>   mi/mibstore.h  | 23 -----------------------
>   2 files changed, 1 insertion(+), 25 deletions(-)
>   delete mode 100644 mi/mibstore.h
> 
> diff --git a/mi/Makefile.am b/mi/Makefile.am
> index 96ceeaa..0cef779 100644
> --- a/mi/Makefile.am
> +++ b/mi/Makefile.am
> @@ -1,7 +1,7 @@
>   noinst_LTLIBRARIES = libmi.la
>   
>   if XORG
> -sdk_HEADERS = micmap.h miline.h mipointer.h mi.h mibstore.h \
> +sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \
>                 migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
>                 mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h
>   endif
> @@ -12,7 +12,6 @@ libmi_la_SOURCES = 	\
>   	mi.h		\
>   	miarc.c		\
>   	mibitblt.c	\
> -	mibstore.h	\
>   	micmap.c	\
>   	micmap.h	\
>   	micoord.h	\
> diff --git a/mi/mibstore.h b/mi/mibstore.h
> deleted file mode 100644
> index f8ed444..0000000
> --- a/mi/mibstore.h
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -/*-
> - * mibstore.h --
> - *	Header file for users of the MI backing-store scheme.
> - *
> - * Copyright (c) 1987 by the Regents of the University of California
> - *
> - * Permission to use, copy, modify, and distribute this
> - * software and its documentation for any purpose and without
> - * fee is hereby granted, provided that the above copyright
> - * notice appear in all copies.  The University of California
> - * makes no representations about the suitability of this
> - * software for any purpose.  It is provided "as is" without
> - * express or implied warranty.
> - */
> -
> -#ifndef _MIBSTORE_H
> -#define _MIBSTORE_H
> -
> -#include "screenint.h"
> -
> -#define miInitializeBackingStore(x) do {} while (0)
> -
> -#endif                          /* _MIBSTORE_H */
>
Daniel Martin - Sept. 10, 2012, 8:59 p.m.
On Mon, Sep 10, 2012 at 09:26:18AM -0700, Aaron Plattner wrote:
> Fine with us, since our driver won't call miInitializeBackingStore on ABIs
> 8, but I think other drivers need to be fixed before this goes in: ...

I'll do so and I would send patches to the respective mailling list of:
    mesa
    xf86-video-ati
    xf86-video-intel
and every driver I'll find a distinct list for.

For everything else:
    xf86-video-apm
    xf86-video-ark
    xf86-video-ast
    xf86-video-chips
    xf86-video-cirrus
    xf86-video-cyrix
    xf86-video-dummy
    xf86-video-fbdev
    xf86-video-geode
    xf86-video-glide
    xf86-video-glint
    xf86-video-i128
    xf86-video-i740
    xf86-video-impact
    xf86-video-imstt
    xf86-video-mach64
    xf86-video-mga
    xf86-video-modesetting
    xf86-video-neomagic
    xf86-video-nested
    xf86-video-newport
    xf86-video-nsc
    xf86-video-nv
    xf86-video-omap
    xf86-video-qxl
    xf86-video-r128
    xf86-video-radeonhd
    xf86-video-rendition
    xf86-video-s3
    xf86-video-s3virge
    xf86-video-savage
    xf86-video-siliconmotion
    xf86-video-sis
    xf86-video-sisusb
    xf86-video-sunbw2
    xf86-video-suncg14
    xf86-video-suncg3
    xf86-video-suncg6
    xf86-video-sunffb
    xf86-video-sunleo
    xf86-video-suntcx
    xf86-video-tdfx
    xf86-video-tga
    xf86-video-trident
    xf86-video-tseng
    xf86-video-vermilion
    xf86-video-vesa
    xf86-video-vga
    xf86-video-via
    xf86-video-vmware
    xf86-video-voodoo
    xf86-video-wsfb
    xf86-video-xgi
    xf86-video-xgixp
I would create some kind of a patch set and send it to this list.

Anyone having concerns with this procedure? An advice how to do it
better?

Cheers,
Daniel Martin

Patch

diff --git a/mi/Makefile.am b/mi/Makefile.am
index 96ceeaa..0cef779 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -1,7 +1,7 @@ 
 noinst_LTLIBRARIES = libmi.la
 
 if XORG
-sdk_HEADERS = micmap.h miline.h mipointer.h mi.h mibstore.h \
+sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \
               migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
               mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h
 endif
@@ -12,7 +12,6 @@  libmi_la_SOURCES = 	\
 	mi.h		\
 	miarc.c		\
 	mibitblt.c	\
-	mibstore.h	\
 	micmap.c	\
 	micmap.h	\
 	micoord.h	\
diff --git a/mi/mibstore.h b/mi/mibstore.h
deleted file mode 100644
index f8ed444..0000000
--- a/mi/mibstore.h
+++ /dev/null
@@ -1,23 +0,0 @@ 
-/*-
- * mibstore.h --
- *	Header file for users of the MI backing-store scheme.
- *
- * Copyright (c) 1987 by the Regents of the University of California
- *
- * Permission to use, copy, modify, and distribute this
- * software and its documentation for any purpose and without
- * fee is hereby granted, provided that the above copyright
- * notice appear in all copies.  The University of California
- * makes no representations about the suitability of this
- * software for any purpose.  It is provided "as is" without
- * express or implied warranty.
- */
-
-#ifndef _MIBSTORE_H
-#define _MIBSTORE_H
-
-#include "screenint.h"
-
-#define miInitializeBackingStore(x) do {} while (0)
-
-#endif                          /* _MIBSTORE_H */