* [PATCH] drm/omap: Remove cpu_is_omapXXXX usage in DMM
@ 2012-10-17 5:30 Andy Gross
0 siblings, 0 replies; only message in thread
From: Andy Gross @ 2012-10-17 5:30 UTC (permalink / raw)
To: dri-devel; +Cc: Greg Kroah-Hartman, Rob Clark
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>
---
drivers/staging/omapdrm/omap_dmm_tiler.c | 2 +-
drivers/staging/omapdrm/omap_dmm_tiler.h | 7 +------
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 e2f1e37..6376e17 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.c
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.c
@@ -487,7 +487,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 7b1052a..8c1fe5c 100644
--- a/drivers/staging/omapdrm/omap_dmm_tiler.h
+++ b/drivers/staging/omapdrm/omap_dmm_tiler.h
@@ -94,7 +94,7 @@ uint32_t tiler_stride(enum tiler_fmt fmt);
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;
@@ -126,9 +126,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 b740adc..33faa32 100644
--- a/drivers/staging/omapdrm/omap_gem.c
+++ b/drivers/staging/omapdrm/omap_gem.c
@@ -1408,7 +1408,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;
--
1.7.5.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-17 5:30 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-17 5:30 [PATCH] drm/omap: Remove cpu_is_omapXXXX usage in DMM Andy Gross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).