| Message ID | 20180911212224.26618-1-rodrigo.vivi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [libdrm] intel: annotate the intel genx helpers as private | expand |
On Tuesday, 2018-09-11 14:22:24 -0700, Rodrigo Vivi wrote: > From: Emil Velikov <emil.velikov@collabora.com> > > They're used internally and never meant to be part of the API. > Add the drm_private notation, which should resolve that. > > v2: (Rodrigo) Add missing include. > > Cc: Eric Engestrom <eric.engestrom@intel.com> > Cc: Lucas De Marchi <lucas.demarchi@intel.com> > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> > Fixes: 4e81d4f9c9b ("intel: add generic functions to check PCI ID") > Signed-off-by: Emil Velikov <emil.velikov@collabora.com> > Acked-by: Lucas De Marchi <lucas.demarchi@intel.com> > Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > --- > intel/intel_chipset.c | 4 ++-- > intel/intel_chipset.h | 6 ++++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/intel/intel_chipset.c b/intel/intel_chipset.c > index d5c33cc5..5aa4a2f2 100644 > --- a/intel/intel_chipset.c > +++ b/intel/intel_chipset.c > @@ -44,7 +44,7 @@ static const struct pci_device { > INTEL_SKL_IDS(9), > }; > > -bool intel_is_genx(unsigned int devid, int gen) > +drm_private bool intel_is_genx(unsigned int devid, int gen) > { > const struct pci_device *p, > *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); > @@ -66,7 +66,7 @@ bool intel_is_genx(unsigned int devid, int gen) > return false; > } > > -bool intel_get_genx(unsigned int devid, int *gen) > +drm_private bool intel_get_genx(unsigned int devid, int *gen) > { > const struct pci_device *p, > *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); > diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h > index 9b1e64f1..990a81e8 100644 > --- a/intel/intel_chipset.h > +++ b/intel/intel_chipset.h > @@ -28,6 +28,8 @@ > #ifndef _INTEL_CHIPSET_H > #define _INTEL_CHIPSET_H > > +#include <libdrm_macros.h> Good catch on the missing #include :) Might want to move it to keep it grouped with the other #include below, but other than that: Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> > + > #define PCI_CHIP_I810 0x7121 > #define PCI_CHIP_I810_DC100 0x7123 > #define PCI_CHIP_I810_E 0x7125 > @@ -330,8 +332,8 @@ > /* New platforms use kernel pci ids */ > #include <stdbool.h> > > -bool intel_is_genx(unsigned int devid, int gen); > -bool intel_get_genx(unsigned int devid, int *gen); > +drm_private bool intel_is_genx(unsigned int devid, int gen); > +drm_private bool intel_get_genx(unsigned int devid, int *gen); > > #define IS_GEN9(devid) intel_is_genx(devid, 9) > #define IS_GEN10(devid) intel_is_genx(devid, 10) > -- > 2.17.1 >
diff --git a/intel/intel_chipset.c b/intel/intel_chipset.c index d5c33cc5..5aa4a2f2 100644 --- a/intel/intel_chipset.c +++ b/intel/intel_chipset.c @@ -44,7 +44,7 @@ static const struct pci_device { INTEL_SKL_IDS(9), }; -bool intel_is_genx(unsigned int devid, int gen) +drm_private bool intel_is_genx(unsigned int devid, int gen) { const struct pci_device *p, *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); @@ -66,7 +66,7 @@ bool intel_is_genx(unsigned int devid, int gen) return false; } -bool intel_get_genx(unsigned int devid, int *gen) +drm_private bool intel_get_genx(unsigned int devid, int *gen) { const struct pci_device *p, *pend = pciids + sizeof(pciids) / sizeof(pciids[0]); diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h index 9b1e64f1..990a81e8 100644 --- a/intel/intel_chipset.h +++ b/intel/intel_chipset.h @@ -28,6 +28,8 @@ #ifndef _INTEL_CHIPSET_H #define _INTEL_CHIPSET_H +#include <libdrm_macros.h> + #define PCI_CHIP_I810 0x7121 #define PCI_CHIP_I810_DC100 0x7123 #define PCI_CHIP_I810_E 0x7125 @@ -330,8 +332,8 @@ /* New platforms use kernel pci ids */ #include <stdbool.h> -bool intel_is_genx(unsigned int devid, int gen); -bool intel_get_genx(unsigned int devid, int *gen); +drm_private bool intel_is_genx(unsigned int devid, int gen); +drm_private bool intel_get_genx(unsigned int devid, int *gen); #define IS_GEN9(devid) intel_is_genx(devid, 9) #define IS_GEN10(devid) intel_is_genx(devid, 10)