git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
msm
/
msm_drv.c
diff --git
a/drivers/gpu/drm/msm/msm_drv.c
b/drivers/gpu/drm/msm/msm_drv.c
index 555666e3f9603a2305a44c84453a56ceda2b9abf..ff19c5a94d6f145891410a1cfbe3dbff3d105e42 100644
(file)
--- a/
drivers/gpu/drm/msm/msm_drv.c
+++ b/
drivers/gpu/drm/msm/msm_drv.c
@@
-512,6
+512,9
@@
static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
struct msm_kms *kms;
int ret, i;
+ if (drm_firmware_drivers_only())
+ return -ENODEV;
+
ddev = drm_dev_alloc(drv, dev);
if (IS_ERR(ddev)) {
DRM_DEV_ERROR(dev, "failed to allocate drm_device\n");