diff options
| author | Dave Airlie | 2018-05-15 11:25:07 +0200 |
|---|---|---|
| committer | Dave Airlie | 2018-05-15 11:25:07 +0200 |
| commit | 2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4 (patch) | |
| tree | d2d5b989da8bc75e2cec4c76a6acb2ab25008539 /drivers/gpu/drm/bridge | |
| parent | Merge tag 'drm-amdkfd-next-2018-05-14' of git://people.freedesktop.org/~gabba... (diff) | |
| parent | gpu: drm: qxl: Adding new typedef vm_fault_t (diff) | |
| download | kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.gz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.tar.xz kernel-qcow2-linux-2045b22461c07a88dc3d2bab3cbfc6dc0c602fd4.zip | |
Merge tag 'drm-misc-next-2018-05-15' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v4.18:
UAPI Changes:
- Fix render node number regression from control node removal.
Driver Changes:
- Small header fix for virgl, used by qemu.
- Use vm_fault_t in qxl.
Signed-off-by: Dave Airlie <airlied@redhat.com>
# gpg: Signature made Tue 15 May 2018 06:16:03 PM AEST
# gpg: using RSA key FE558C72A67013C3
# gpg: Can't check signature: public key not found
Link: https://patchwork.freedesktop.org/patch/msgid/e63306b9-67a0-74ab-8883-08b3d9db72d2@mblankhorst.nl
Diffstat (limited to 'drivers/gpu/drm/bridge')
| -rw-r--r-- | drivers/gpu/drm/bridge/adv7511/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/Kconfig b/drivers/gpu/drm/bridge/adv7511/Kconfig index 592b9d2ec034..944e440c4fde 100644 --- a/drivers/gpu/drm/bridge/adv7511/Kconfig +++ b/drivers/gpu/drm/bridge/adv7511/Kconfig @@ -1,5 +1,5 @@ config DRM_I2C_ADV7511 - tristate "AV7511 encoder" + tristate "ADV7511 encoder" depends on OF select DRM_KMS_HELPER select REGMAP_I2C diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index 2614cea538e2..73021b388e12 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -1127,7 +1127,7 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) } if (adv7511->gpio_pd) { - mdelay(5); + usleep_range(5000, 6000); gpiod_set_value_cansleep(adv7511->gpio_pd, 0); } |