projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
qxl
/
qxl_display.c
diff --git
a/drivers/gpu/drm/qxl/qxl_display.c
b/drivers/gpu/drm/qxl/qxl_display.c
index 5edebf495c07827795174163fc3bcbf96e2ce7b2..f92c46ec9a963c89597a5c21ef3da7385f859c2e 100644
(file)
--- a/
drivers/gpu/drm/qxl/qxl_display.c
+++ b/
drivers/gpu/drm/qxl/qxl_display.c
@@
-985,7
+985,7
@@
static int qdev_output_init(struct drm_device *dev, int num_output)
&qxl_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL);
drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs,
&qxl_connector_funcs, DRM_MODE_CONNECTOR_VIRTUAL);
drm_encoder_init(dev, &qxl_output->enc, &qxl_enc_funcs,
- DRM_MODE_ENCODER_VIRTUAL);
+ DRM_MODE_ENCODER_VIRTUAL
, NULL
);
/* we get HPD via client monitors config */
connector->polled = DRM_CONNECTOR_POLL_HPD;
/* we get HPD via client monitors config */
connector->polled = DRM_CONNECTOR_POLL_HPD;