staging: drm/omap: Disable DMM debugfs for OMAP3
OMAP3 does not contain a DMM/Tiler block. As such, we should not be exposing any DMM debugfs entries on OMAP3 platforms. Added inline helper function to verify existence of DMM. Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f6b6036e56
commit
132390c79e
|
@ -112,12 +112,10 @@ int omap_debugfs_init(struct drm_minor *minor)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO: only do this if has_dmm.. but this fxn gets called before
|
if (dmm_is_available())
|
||||||
* dev_load() so we don't know this yet..
|
ret = drm_debugfs_create_files(omap_dmm_debugfs_list,
|
||||||
*/
|
ARRAY_SIZE(omap_dmm_debugfs_list),
|
||||||
ret = drm_debugfs_create_files(omap_dmm_debugfs_list,
|
minor->debugfs_root, minor);
|
||||||
ARRAY_SIZE(omap_dmm_debugfs_list),
|
|
||||||
minor->debugfs_root, minor);
|
|
||||||
|
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(dev->dev, "could not install omap_dmm_debugfs_list\n");
|
dev_err(dev->dev, "could not install omap_dmm_debugfs_list\n");
|
||||||
|
@ -131,8 +129,9 @@ void omap_debugfs_cleanup(struct drm_minor *minor)
|
||||||
{
|
{
|
||||||
drm_debugfs_remove_files(omap_debugfs_list,
|
drm_debugfs_remove_files(omap_debugfs_list,
|
||||||
ARRAY_SIZE(omap_debugfs_list), minor);
|
ARRAY_SIZE(omap_debugfs_list), minor);
|
||||||
drm_debugfs_remove_files(omap_dmm_debugfs_list,
|
if (dmm_is_available())
|
||||||
ARRAY_SIZE(omap_dmm_debugfs_list), minor);
|
drm_debugfs_remove_files(omap_dmm_debugfs_list,
|
||||||
|
ARRAY_SIZE(omap_dmm_debugfs_list), minor);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
#ifndef OMAP_DMM_TILER_H
|
#ifndef OMAP_DMM_TILER_H
|
||||||
#define OMAP_DMM_TILER_H
|
#define OMAP_DMM_TILER_H
|
||||||
|
|
||||||
|
#include <plat/cpu.h>
|
||||||
#include "omap_drv.h"
|
#include "omap_drv.h"
|
||||||
#include "tcm.h"
|
#include "tcm.h"
|
||||||
|
|
||||||
|
@ -132,4 +133,9 @@ struct omap_dmm_platform_data {
|
||||||
int irq;
|
int irq;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static inline int dmm_is_available(void)
|
||||||
|
{
|
||||||
|
return cpu_is_omap44xx();
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue