Skip to content

Commit

Permalink
drm/exynos: Remove tracking log functions
Browse files Browse the repository at this point in the history 
This patch removes tracking log functions which were used to debug
in the early development stage and are not so important as were.
So remove them for code clean up.

Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
  • Loading branch information
YoungJun Cho authored and Inki Dae committed Jun 28, 2013
1 parent 16844fb commit bca34c9
Show file tree
Hide file tree
Showing 20 changed files with 4 additions and 437 deletions.
7 changes: 0 additions & 7 deletions drivers/gpu/drm/exynos/exynos_drm_buf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ static int lowlevel_buffer_allocate(struct drm_device *dev,
enum dma_attr attr;
unsigned int nr_pages;

DRM_DEBUG_KMS("%s\n", __FILE__);

if (buf->dma_addr) {
DRM_DEBUG_KMS("already allocated.\n");
return 0;
Expand Down Expand Up @@ -119,8 +117,6 @@ static int lowlevel_buffer_allocate(struct drm_device *dev,
static void lowlevel_buffer_deallocate(struct drm_device *dev,
unsigned int flags, struct exynos_drm_gem_buf *buf)
{
DRM_DEBUG_KMS("%s.\n", __FILE__);

if (!buf->dma_addr) {
DRM_DEBUG_KMS("dma_addr is invalid.\n");
return;
Expand Down Expand Up @@ -151,7 +147,6 @@ struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,
{
struct exynos_drm_gem_buf *buffer;

DRM_DEBUG_KMS("%s.\n", __FILE__);
DRM_DEBUG_KMS("desired size = 0x%x\n", size);

buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
Expand All @@ -167,8 +162,6 @@ struct exynos_drm_gem_buf *exynos_drm_init_buf(struct drm_device *dev,
void exynos_drm_fini_buf(struct drm_device *dev,
struct exynos_drm_gem_buf *buffer)
{
DRM_DEBUG_KMS("%s.\n", __FILE__);

if (!buffer) {
DRM_DEBUG_KMS("buffer is null.\n");
return;
Expand Down
13 changes: 0 additions & 13 deletions drivers/gpu/drm/exynos/exynos_drm_connector.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ convert_to_display_mode(struct drm_display_mode *mode,
struct exynos_drm_panel_info *panel)
{
struct fb_videomode *timing = &panel->timing;
DRM_DEBUG_KMS("%s\n", __FILE__);

mode->clock = timing->pixclock / 1000;
mode->vrefresh = timing->refresh;
Expand Down Expand Up @@ -68,8 +67,6 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector)
unsigned int count = 0;
int ret;

DRM_DEBUG_KMS("%s\n", __FILE__);

if (!display_ops) {
DRM_DEBUG_KMS("display_ops is null.\n");
return 0;
Expand Down Expand Up @@ -156,8 +153,6 @@ struct drm_encoder *exynos_drm_best_encoder(struct drm_connector *connector)
struct drm_mode_object *obj;
struct drm_encoder *encoder;

DRM_DEBUG_KMS("%s\n", __FILE__);

obj = drm_mode_object_find(dev, exynos_connector->encoder_id,
DRM_MODE_OBJECT_ENCODER);
if (!obj) {
Expand Down Expand Up @@ -200,8 +195,6 @@ void exynos_drm_display_power(struct drm_connector *connector, int mode)
static void exynos_drm_connector_dpms(struct drm_connector *connector,
int mode)
{
DRM_DEBUG_KMS("%s\n", __FILE__);

/*
* in case that drm_crtc_helper_set_mode() is called,
* encoder/crtc->funcs->dpms() will be just returned
Expand Down Expand Up @@ -248,8 +241,6 @@ exynos_drm_connector_detect(struct drm_connector *connector, bool force)
manager->display_ops;
enum drm_connector_status status = connector_status_disconnected;

DRM_DEBUG_KMS("%s\n", __FILE__);

if (display_ops && display_ops->is_connected) {
if (display_ops->is_connected(manager->dev))
status = connector_status_connected;
Expand All @@ -265,8 +256,6 @@ static void exynos_drm_connector_destroy(struct drm_connector *connector)
struct exynos_drm_connector *exynos_connector =
to_exynos_connector(connector);

DRM_DEBUG_KMS("%s\n", __FILE__);

drm_sysfs_connector_remove(connector);
drm_connector_cleanup(connector);
kfree(exynos_connector);
Expand All @@ -288,8 +277,6 @@ struct drm_connector *exynos_drm_connector_create(struct drm_device *dev,
int type;
int err;

DRM_DEBUG_KMS("%s\n", __FILE__);

exynos_connector = kzalloc(sizeof(*exynos_connector), GFP_KERNEL);
if (!exynos_connector) {
DRM_ERROR("failed to allocate connector\n");
Expand Down
12 changes: 0 additions & 12 deletions drivers/gpu/drm/exynos/exynos_drm_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ static int exynos_drm_create_enc_conn(struct drm_device *dev,
struct drm_connector *connector;
int ret;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

subdrv->manager->dev = subdrv->dev;

/* create and initialize a encoder for this sub driver. */
Expand Down Expand Up @@ -102,8 +100,6 @@ static int exynos_drm_subdrv_probe(struct drm_device *dev,
static void exynos_drm_subdrv_remove(struct drm_device *dev,
struct exynos_drm_subdrv *subdrv)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (subdrv->remove)
subdrv->remove(dev, subdrv->dev);
}
Expand All @@ -114,8 +110,6 @@ int exynos_drm_device_register(struct drm_device *dev)
unsigned int fine_cnt = 0;
int err;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (!dev)
return -EINVAL;

Expand Down Expand Up @@ -158,8 +152,6 @@ int exynos_drm_device_unregister(struct drm_device *dev)
{
struct exynos_drm_subdrv *subdrv;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (!dev) {
WARN(1, "Unexpected drm device unregister!\n");
return -EINVAL;
Expand All @@ -176,8 +168,6 @@ EXPORT_SYMBOL_GPL(exynos_drm_device_unregister);

int exynos_drm_subdrv_register(struct exynos_drm_subdrv *subdrv)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (!subdrv)
return -EINVAL;

Expand All @@ -189,8 +179,6 @@ EXPORT_SYMBOL_GPL(exynos_drm_subdrv_register);

int exynos_drm_subdrv_unregister(struct exynos_drm_subdrv *subdrv)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (!subdrv)
return -EINVAL;

Expand Down
28 changes: 0 additions & 28 deletions drivers/gpu/drm/exynos/exynos_drm_crtc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,13 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)

static void exynos_drm_crtc_prepare(struct drm_crtc *crtc)
{
DRM_DEBUG_KMS("%s\n", __FILE__);

/* drm framework doesn't check NULL. */
}

static void exynos_drm_crtc_commit(struct drm_crtc *crtc)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

DRM_DEBUG_KMS("%s\n", __FILE__);

exynos_drm_crtc_dpms(crtc, DRM_MODE_DPMS_ON);
exynos_plane_commit(exynos_crtc->plane);
exynos_plane_dpms(exynos_crtc->plane, DRM_MODE_DPMS_ON);
Expand All @@ -97,8 +93,6 @@ exynos_drm_crtc_mode_fixup(struct drm_crtc *crtc,
const struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode)
{
DRM_DEBUG_KMS("%s\n", __FILE__);

/* drm framework doesn't check NULL */
return true;
}
Expand All @@ -115,8 +109,6 @@ exynos_drm_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode,
int pipe = exynos_crtc->pipe;
int ret;

DRM_DEBUG_KMS("%s\n", __FILE__);

/*
* copy the mode data adjusted by mode_fixup() into crtc->mode
* so that hardware can be seet to proper mode.
Expand Down Expand Up @@ -148,8 +140,6 @@ static int exynos_drm_crtc_mode_set_commit(struct drm_crtc *crtc, int x, int y,
unsigned int crtc_h;
int ret;

DRM_DEBUG_KMS("%s\n", __FILE__);

/* when framebuffer changing is requested, crtc's dpms should be on */
if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) {
DRM_ERROR("failed framebuffer changing request.\n");
Expand Down Expand Up @@ -179,8 +169,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc)
{
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

DRM_DEBUG_KMS("%s\n", __FILE__);

exynos_plane_dpms(exynos_crtc->plane, DRM_MODE_DPMS_OFF);
exynos_drm_crtc_dpms(crtc, DRM_MODE_DPMS_OFF);
}
Expand All @@ -205,8 +193,6 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
struct drm_framebuffer *old_fb = crtc->fb;
int ret = -EINVAL;

DRM_DEBUG_KMS("%s\n", __FILE__);

/* when the page flip is requested, crtc's dpms should be on */
if (exynos_crtc->dpms > DRM_MODE_DPMS_ON) {
DRM_ERROR("failed page flip request.\n");
Expand Down Expand Up @@ -259,8 +245,6 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc)
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
struct exynos_drm_private *private = crtc->dev->dev_private;

DRM_DEBUG_KMS("%s\n", __FILE__);

private->crtc[exynos_crtc->pipe] = NULL;

drm_crtc_cleanup(crtc);
Expand All @@ -275,8 +259,6 @@ static int exynos_drm_crtc_set_property(struct drm_crtc *crtc,
struct exynos_drm_private *dev_priv = dev->dev_private;
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);

DRM_DEBUG_KMS("%s\n", __func__);

if (property == dev_priv->crtc_mode_property) {
enum exynos_crtc_mode mode = val;

Expand Down Expand Up @@ -321,8 +303,6 @@ static void exynos_drm_crtc_attach_mode_property(struct drm_crtc *crtc)
struct exynos_drm_private *dev_priv = dev->dev_private;
struct drm_property *prop;

DRM_DEBUG_KMS("%s\n", __func__);

prop = dev_priv->crtc_mode_property;
if (!prop) {
prop = drm_property_create_enum(dev, 0, "mode", mode_names,
Expand All @@ -342,8 +322,6 @@ int exynos_drm_crtc_create(struct drm_device *dev, unsigned int nr)
struct exynos_drm_private *private = dev->dev_private;
struct drm_crtc *crtc;

DRM_DEBUG_KMS("%s\n", __FILE__);

exynos_crtc = kzalloc(sizeof(*exynos_crtc), GFP_KERNEL);
if (!exynos_crtc) {
DRM_ERROR("failed to allocate exynos crtc\n");
Expand Down Expand Up @@ -378,8 +356,6 @@ int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int crtc)
struct exynos_drm_crtc *exynos_crtc =
to_exynos_crtc(private->crtc[crtc]);

DRM_DEBUG_KMS("%s\n", __FILE__);

if (exynos_crtc->dpms != DRM_MODE_DPMS_ON)
return -EPERM;

Expand All @@ -395,8 +371,6 @@ void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int crtc)
struct exynos_drm_crtc *exynos_crtc =
to_exynos_crtc(private->crtc[crtc]);

DRM_DEBUG_KMS("%s\n", __FILE__);

if (exynos_crtc->dpms != DRM_MODE_DPMS_ON)
return;

Expand All @@ -412,8 +386,6 @@ void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int crtc)
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(drm_crtc);
unsigned long flags;

DRM_DEBUG_KMS("%s\n", __FILE__);

spin_lock_irqsave(&dev->event_lock, flags);

list_for_each_entry_safe(e, t, &dev_priv->pageflip_event_list,
Expand Down
6 changes: 0 additions & 6 deletions drivers/gpu/drm/exynos/exynos_drm_dmabuf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ static struct sg_table *
unsigned int i;
int nents, ret;

DRM_DEBUG_PRIME("%s\n", __FILE__);

/* just return current sgt if already requested. */
if (exynos_attach->dir == dir && exynos_attach->is_mapped)
return &exynos_attach->sgt;
Expand Down Expand Up @@ -133,8 +131,6 @@ static void exynos_dmabuf_release(struct dma_buf *dmabuf)
{
struct exynos_drm_gem_obj *exynos_gem_obj = dmabuf->priv;

DRM_DEBUG_PRIME("%s\n", __FILE__);

/*
* exynos_dmabuf_release() call means that file object's
* f_count is 0 and it calls drm_gem_object_handle_unreference()
Expand Down Expand Up @@ -219,8 +215,6 @@ struct drm_gem_object *exynos_dmabuf_prime_import(struct drm_device *drm_dev,
struct exynos_drm_gem_buf *buffer;
int ret;

DRM_DEBUG_PRIME("%s\n", __FILE__);

/* is this one of own objects? */
if (dma_buf->ops == &exynos_dmabuf_ops) {
struct drm_gem_object *obj;
Expand Down
20 changes: 0 additions & 20 deletions drivers/gpu/drm/exynos/exynos_drm_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)
int ret;
int nr;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

private = kzalloc(sizeof(struct exynos_drm_private), GFP_KERNEL);
if (!private) {
DRM_ERROR("failed to allocate private\n");
Expand Down Expand Up @@ -140,8 +138,6 @@ static int exynos_drm_load(struct drm_device *dev, unsigned long flags)

static int exynos_drm_unload(struct drm_device *dev)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

exynos_drm_fbdev_fini(dev);
exynos_drm_device_unregister(dev);
drm_vblank_cleanup(dev);
Expand All @@ -160,8 +156,6 @@ static int exynos_drm_open(struct drm_device *dev, struct drm_file *file)
{
struct drm_exynos_file_private *file_priv;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

file_priv = kzalloc(sizeof(*file_priv), GFP_KERNEL);
if (!file_priv)
return -ENOMEM;
Expand All @@ -178,8 +172,6 @@ static void exynos_drm_preclose(struct drm_device *dev,
struct drm_pending_vblank_event *e, *t;
unsigned long flags;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

/* release events of current file */
spin_lock_irqsave(&dev->event_lock, flags);
list_for_each_entry_safe(e, t, &private->pageflip_event_list,
Expand All @@ -196,8 +188,6 @@ static void exynos_drm_preclose(struct drm_device *dev,

static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

if (!file->driver_priv)
return;

Expand All @@ -207,8 +197,6 @@ static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file)

static void exynos_drm_lastclose(struct drm_device *dev)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

exynos_drm_fbdev_restore_mode(dev);
}

Expand Down Expand Up @@ -292,8 +280,6 @@ static struct drm_driver exynos_drm_driver = {

static int exynos_drm_platform_probe(struct platform_device *pdev)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
exynos_drm_driver.num_ioctls = DRM_ARRAY_SIZE(exynos_ioctls);

Expand All @@ -302,8 +288,6 @@ static int exynos_drm_platform_probe(struct platform_device *pdev)

static int exynos_drm_platform_remove(struct platform_device *pdev)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

drm_platform_exit(&exynos_drm_driver, pdev);

return 0;
Expand All @@ -322,8 +306,6 @@ static int __init exynos_drm_init(void)
{
int ret;

DRM_DEBUG_DRIVER("%s\n", __FILE__);

#ifdef CONFIG_DRM_EXYNOS_FIMD
ret = platform_driver_register(&fimd_driver);
if (ret < 0)
Expand Down Expand Up @@ -455,8 +437,6 @@ static int __init exynos_drm_init(void)

static void __exit exynos_drm_exit(void)
{
DRM_DEBUG_DRIVER("%s\n", __FILE__);

platform_device_unregister(exynos_drm_pdev);

platform_driver_unregister(&exynos_drm_platform_driver);
Expand Down
Loading

0 comments on commit bca34c9

Please sign in to comment.