diff options
| author | Andy Gross <andy.gross@ti.com> | 2012-10-17 09:30:03 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-23 02:55:19 +0400 |
| commit | e5e4e9b70c7dfd3ba98d3e8a3951ee3b3cd2a0f9 (patch) | |
| tree | add79a811d74377b59641e1f55b14a3ad16edd4e /drivers/staging/omapdrm | |
| parent | 41c66e06219c645a1fae94811591ad964804f443 (diff) | |
| download | linux-e5e4e9b70c7dfd3ba98d3e8a3951ee3b3cd2a0f9.tar.xz | |
drm/omap: Remove cpu_is_omapXXXX usage in DMM
Removed usage of the cpu_is_omapXXXX in the DMM driver. This is no
longer necessary as we can key off of the omap_dmm pointer that is
only non-NULL if the device has been probed successfully.
Signed-off-by: Andy Gross <andy.gross@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/omapdrm')
| -rw-r--r-- | drivers/staging/omapdrm/omap_dmm_tiler.c | 2 | ||||
| -rw-r--r-- | drivers/staging/omapdrm/omap_dmm_tiler.h | 7 | ||||
| -rw-r--r-- | drivers/staging/omapdrm/omap_gem.c | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.c b/drivers/staging/omapdrm/omap_dmm_tiler.c index 7d3b7d441c6e..4d138df369b3 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.c +++ b/drivers/staging/omapdrm/omap_dmm_tiler.c @@ -522,7 +522,7 @@ size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h) return round_up(geom[fmt].cpp * w, PAGE_SIZE) * h; } -bool dmm_is_initialized(void) +bool dmm_is_available(void) { return omap_dmm ? true : false; } diff --git a/drivers/staging/omapdrm/omap_dmm_tiler.h b/drivers/staging/omapdrm/omap_dmm_tiler.h index 740911df5fc3..c0271a2ac877 100644 --- a/drivers/staging/omapdrm/omap_dmm_tiler.h +++ b/drivers/staging/omapdrm/omap_dmm_tiler.h @@ -107,7 +107,7 @@ uint32_t tiler_stride(enum tiler_fmt fmt, uint32_t orient); size_t tiler_size(enum tiler_fmt fmt, uint16_t w, uint16_t h); size_t tiler_vsize(enum tiler_fmt fmt, uint16_t w, uint16_t h); void tiler_align(enum tiler_fmt fmt, uint16_t *w, uint16_t *h); -bool dmm_is_initialized(void); +bool dmm_is_available(void); extern struct platform_driver omap_dmm_driver; @@ -139,9 +139,4 @@ static inline bool validfmt(enum tiler_fmt fmt) } } -static inline int dmm_is_available(void) -{ - return cpu_is_omap44xx(); -} - #endif diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c index 3434e6ec0142..0e4a6b70663d 100644 --- a/drivers/staging/omapdrm/omap_gem.c +++ b/drivers/staging/omapdrm/omap_gem.c @@ -1435,7 +1435,7 @@ void omap_gem_init(struct drm_device *dev) }; int i, j; - if (!dmm_is_initialized()) { + if (!dmm_is_available()) { /* DMM only supported on OMAP4 and later, so this isn't fatal */ dev_warn(dev->dev, "DMM not available, disable DMM support\n"); return; |