diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2012-11-08 09:52:27 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2012-11-09 09:59:49 +0200 |
| commit | ebfa14d1d1851bd063b8d50e2071ee52acbf76b6 (patch) | |
| tree | ce17235eca8f7e5d7ccdfc528edc0554975a115d /gralloc_drm_intel.c | |
| parent | 2a9d541f07691057df3cb0a8fa231fef58664af0 (diff) | |
| download | external_drm_gralloc-ebfa14d1d1851bd063b8d50e2071ee52acbf76b6.zip external_drm_gralloc-ebfa14d1d1851bd063b8d50e2071ee52acbf76b6.tar.gz external_drm_gralloc-ebfa14d1d1851bd063b8d50e2071ee52acbf76b6.tar.bz2 | |
gralloc: use headers from drm and mesa instead of local copy
Patch removes local outdated headers for intel hw and starts
to depend on ones from libdrm and mesa projects, this makes sure
we are up to date with new pci id's etc.
intel_init_kms_features required some fixing because of changed
macros, patch also adds GEN7 check in place for IVB and HSW.
Change-Id: Iee6375ceb558baf4334e3b9b5d26210406aa7b71
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Diffstat (limited to 'gralloc_drm_intel.c')
| -rw-r--r-- | gralloc_drm_intel.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gralloc_drm_intel.c b/gralloc_drm_intel.c index 6a0d7e0..649c6ff 100644 --- a/gralloc_drm_intel.c +++ b/gralloc_drm_intel.c @@ -489,7 +489,7 @@ static void intel_unmap(struct gralloc_drm_drv_t *drv, drm_intel_bo_unmap(ib->ibo); } -#include "dri/intel_chipset.h" /* for IS_965() */ +#include "intel_chipset.h" /* for platform detection macros */ static void intel_init_kms_features(struct gralloc_drm_drv_t *drv, struct gralloc_drm_t *drm) { @@ -522,8 +522,11 @@ static void intel_init_kms_features(struct gralloc_drm_drv_t *drv, if (drmCommandWriteRead(drm->fd, DRM_I915_GETPARAM, &gp, sizeof(gp))) id = 0; - if (IS_965(id)) { - if (IS_GEN6(id)) + /* GEN4, G4X, GEN5, GEN6, GEN7 */ + if ((IS_9XX(id) || IS_G4X(id)) && !IS_GEN3(id)) { + if (IS_GEN7(id)) + info->gen = 70; + else if (IS_GEN6(id)) info->gen = 60; else if (IS_GEN5(id)) info->gen = 50; |