fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r600g: do not loop in radeon_family_from_device

Browse source 
Also move that function to r600_drm.c
This commit is contained in:
Marek Olšák 2011-09-11 13:47:20 +02:00
parent 85f5d7ceee
commit d26b49f87f
4 changed files with 11 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/winsys/r600/drm/Makefile.sources
View file

@ -1,6 +1,5 @@
C_SOURCES := \
evergreen_hw_context.c \
radeon_pciid.c \
r600_bo.c \
r600_drm.c \
r600_hw_context.c

11
src/gallium/winsys/r600/drm/r600_drm.c
View file

@ -183,6 +183,17 @@ static int radeon_drm_get_tiling(struct radeon *radeon)
}
}
static unsigned radeon_family_from_device(unsigned device)
{
switch (device) {
#define CHIPSET(pciid, name, family) case pciid: return CHIP_##family;
#include "pci_ids/r600_pci_ids.h"
#undef CHIPSET
default:
return CHIP_UNKNOWN;
}
}
struct radeon *radeon_create(struct radeon_winsys *ws)
{
struct radeon *radeon = CALLOC_STRUCT(radeon);

5
src/gallium/winsys/r600/drm/r600_priv.h
View file

@ -70,11 +70,6 @@ struct r600_bo {
unsigned binding;
};
/*
* radeon_pciid.c
*/
unsigned radeon_family_from_device(unsigned device);
/*
* r600_hw_context.c
*/

51
src/gallium/winsys/r600/drm/radeon_pciid.c
View file

@ -1,51 +0,0 @@
/*
* Copyright 2010 Jerome Glisse <glisse@freedesktop.org>
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* on the rights to use, copy, modify, merge, publish, distribute, sub
* license, and/or sell copies of the Software, and to permit persons to whom
* the Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice (including the next
* paragraph) shall be included in all copies or substantial portions of the
* Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE AUTHOR(S) AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* Authors:
* Jerome Glisse
*/
#include "r600_priv.h"
struct pci_id {
unsigned vendor;
unsigned device;
unsigned family;
};
static const struct pci_id radeon_pci_id[] = {
#define CHIPSET(chip, name, family) { 0x1002, chip, CHIP_##family },
#include "pci_ids/r600_pci_ids.h"
{0, 0},
};
unsigned radeon_family_from_device(unsigned device)
{
unsigned i;
for (i = 0; ; i++) {
if (!radeon_pci_id[i].vendor)
return CHIP_UNKNOWN;
if (radeon_pci_id[i].device == device)
return radeon_pci_id[i].family;
}
return CHIP_UNKNOWN;
}