[Mesa-dev] [PATCH] i965: Remove unused devinfo revision

[Ben Widawsky]

On Fri, Oct 23, 2015 at 02:38:39PM -0700, Ben Widawsky wrote:
> I left the function to obtain the revision because it is, and will continue to
> be useful in the future. I'd rather not have to dig it up every time we need it.
> Comments left at the implementation to say as much.
> 

Added locally I've also referenced the SHA where I originally missed this:
commit 28ed1e08e8ba98ebd4ff0b56326372f0df9c73ad
Author: Ben Widawsky <benjamin.widawsky at intel.com>
Date:   Fri Aug 7 13:58:37 2015 -0700

    i965/skl: Remove early platform support


> Signed-off-by: Ben Widawsky <ben at bwidawsk.net>
> ---
>  src/mesa/drivers/dri/i965/brw_device_info.c |  2 +-
>  src/mesa/drivers/dri/i965/brw_device_info.h |  2 +-
>  src/mesa/drivers/dri/i965/intel_screen.c    | 14 +++++++++++---
>  3 files changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/src/mesa/drivers/dri/i965/brw_device_info.c b/src/mesa/drivers/dri/i965/brw_device_info.c
> index e7a016c..789b93f 100644
> --- a/src/mesa/drivers/dri/i965/brw_device_info.c
> +++ b/src/mesa/drivers/dri/i965/brw_device_info.c
> @@ -363,7 +363,7 @@ static const struct brw_device_info brw_device_info_bxt = {
>  };
>  
>  const struct brw_device_info *
> -brw_get_device_info(int devid, int revision)
> +brw_get_device_info(int devid)
>  {
>     const struct brw_device_info *devinfo;
>     switch (devid) {
> diff --git a/src/mesa/drivers/dri/i965/brw_device_info.h b/src/mesa/drivers/dri/i965/brw_device_info.h
> index 2a73e93..4911c23 100644
> --- a/src/mesa/drivers/dri/i965/brw_device_info.h
> +++ b/src/mesa/drivers/dri/i965/brw_device_info.h
> @@ -86,4 +86,4 @@ struct brw_device_info
>     /** @} */
>  };
>  
> -const struct brw_device_info *brw_get_device_info(int devid, int revision);
> +const struct brw_device_info *brw_get_device_info(int devid);
> diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
> index 590c45d..fb95fb6 100644
> --- a/src/mesa/drivers/dri/i965/intel_screen.c
> +++ b/src/mesa/drivers/dri/i965/intel_screen.c
> @@ -1357,7 +1357,16 @@ set_max_gl_versions(struct intel_screen *screen)
>     }
>  }
>  
> -static int
> +/**
> + * Return the revision (generally the revid field of the PCI header) of the
> + * graphics device.
> + *
> + * XXX: This function is useful to keep around even if it is not currently in
> + * use. It is necessary for new platforms and revision specific workarounds or
> + * features. Please don't remove it so that we know it at least continues to
> + * build.
> + */
> +static __attribute__((__unused__)) int
>  brw_get_revision(int fd)
>  {
>     struct drm_i915_getparam gp;
> @@ -1416,8 +1425,7 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
>         return false;
>  
>     intelScreen->deviceID = drm_intel_bufmgr_gem_get_devid(intelScreen->bufmgr);
> -   intelScreen->devinfo = brw_get_device_info(intelScreen->deviceID,
> -                                              brw_get_revision(psp->fd));
> +   intelScreen->devinfo = brw_get_device_info(intelScreen->deviceID);
>     if (!intelScreen->devinfo)
>        return false;
>  
> -- 
> 2.6.1
>