diff options
| author | Stephane Viau <sviau@codeaurora.org> | 2016-07-19 12:59:42 -0400 |
|---|---|---|
| committer | Dhaval Patel <pdhaval@codeaurora.org> | 2016-08-01 11:58:15 -0700 |
| commit | 6421cc40748e05def84d7d554f7670acb2810f58 (patch) | |
| tree | 2efbcd235d1c1bea73d4c149f5647e8cdc4722e2 /drivers/gpu | |
| parent | c2d2bf6758a3906cebd3245efd29fac71047bed0 (diff) | |
drm/msm: rename MSM drm platform driver's name into msm_drm
Before this change, the driver's name was defined as "msm". This
definition conflicts with another MSM driver in the downstream
kernel (camera_v2).
To avoid such conflict (kernel crash), the msm drm driver's name
is changed to "msm_drm", which is also a bit more explicit than
the previous definition.
Change-Id: Idc3e9d3e5d2b04e78e0b7665b7036c07f94d4413
Signed-off-by: Stephane Viau <sviau@codeaurora.org>
[cip@codeaurora.org: Also change name of drm driver
and workqueue from "msm" to "msm_drm"]
Signed-off-by: Clarence Ip <cip@codeaurora.org>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 52479155de49..5209b4b39d20 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -353,7 +353,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags) dev->dev_private = priv; - priv->wq = alloc_ordered_workqueue("msm", 0); + priv->wq = alloc_ordered_workqueue("msm_drm", 0); init_waitqueue_head(&priv->fence_event); init_waitqueue_head(&priv->pending_crtcs_event); @@ -1011,7 +1011,7 @@ static struct drm_driver msm_driver = { .ioctls = msm_ioctls, .num_ioctls = DRM_MSM_NUM_IOCTLS, .fops = &fops, - .name = "msm", + .name = "msm_drm", .desc = "MSM Snapdragon DRM", .date = "20130625", .major = 1, @@ -1160,7 +1160,7 @@ static struct platform_driver msm_platform_driver = { .probe = msm_pdev_probe, .remove = msm_pdev_remove, .driver = { - .name = "msm", + .name = "msm_drm", .of_match_table = dt_match, .pm = &msm_pm_ops, }, |