diff options
| author | Jeykumar Sankaran <jsanka@codeaurora.org> | 2016-02-03 18:54:04 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:30:47 -0700 |
| commit | c747f82604b0f102b8e7ae5a2e4e9c30ba65818a (patch) | |
| tree | 255b4261e2cd4914b43a207df2f57cb3f647daa6 /drivers/video | |
| parent | 7fbc0bb228649c301dd68e6666f25bea703d39c0 (diff) | |
mdp: mdss: Avoid initializing mdss fb when on virtual fb
Avoid intializing MDSS fb device when virtual framebuffer is
enabled.
Change-Id: I20b2823db76e6e8cb3156343311179c5b36c8c34
Signed-off-by: Jeykumar Sankaran <jsanka@codeaurora.org>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_dsi_status.c | 6 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_fb.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi_status.c b/drivers/video/fbdev/msm/mdss_dsi_status.c index 44b91c50c5b5..bf545ae311f2 100644 --- a/drivers/video/fbdev/msm/mdss_dsi_status.c +++ b/drivers/video/fbdev/msm/mdss_dsi_status.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. +/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -126,6 +126,10 @@ static int fb_event_callback(struct notifier_block *self, return NOTIFY_BAD; } + /* handle only mdss fb device */ + if (strncmp("mdssfb", evdata->info->fix.id, 6)) + return NOTIFY_DONE; + mfd = evdata->info->par; ctrl_pdata = container_of(dev_get_platdata(&mfd->pdev->dev), struct mdss_dsi_ctrl_pdata, panel_data); diff --git a/drivers/video/fbdev/msm/mdss_fb.c b/drivers/video/fbdev/msm/mdss_fb.c index 67ef0fd28dea..1aacf6ffef9f 100644 --- a/drivers/video/fbdev/msm/mdss_fb.c +++ b/drivers/video/fbdev/msm/mdss_fb.c @@ -4664,6 +4664,9 @@ int __init mdss_fb_init(void) { int rc = -ENODEV; + if (fb_get_options("msmfb", NULL)) + return rc; + if (platform_driver_register(&mdss_fb_driver)) return rc; |