diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-05 10:44:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-05 10:44:19 -0500 |
| commit | 7cda4cee1366fae236678a5a6b124bab86b14973 (patch) | |
| tree | 180bcb2d09e3db27050658afc36d5bac88593ed5 /drivers/gpu/drm/i915/intel_fbdev.c | |
| parent | a3fde2addd5f0218b64102005a237ef727b0dc30 (diff) | |
| parent | 2391f0b4808e3d5af348324d69f5f45c56a26836 (diff) | |
| download | op-kernel-dev-7cda4cee1366fae236678a5a6b124bab86b14973.zip op-kernel-dev-7cda4cee1366fae236678a5a6b124bab86b14973.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Small overlapping change conflict ('net' changed a line,
'net-next' added a line right afterwards) in flexcan.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_fbdev.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_fbdev.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c index b8af351..ea96682 100644 --- a/drivers/gpu/drm/i915/intel_fbdev.c +++ b/drivers/gpu/drm/i915/intel_fbdev.c @@ -697,10 +697,8 @@ static void intel_fbdev_initial_config(void *data, async_cookie_t cookie) /* Due to peculiar init order wrt to hpd handling this is separate. */ if (drm_fb_helper_initial_config(&ifbdev->helper, - ifbdev->preferred_bpp)) { + ifbdev->preferred_bpp)) intel_fbdev_unregister(to_i915(ifbdev->helper.dev)); - intel_fbdev_fini(to_i915(ifbdev->helper.dev)); - } } void intel_fbdev_initial_config_async(struct drm_device *dev) @@ -800,7 +798,11 @@ void intel_fbdev_output_poll_changed(struct drm_device *dev) { struct intel_fbdev *ifbdev = to_i915(dev)->fbdev; - if (ifbdev) + if (!ifbdev) + return; + + intel_fbdev_sync(ifbdev); + if (ifbdev->vma) drm_fb_helper_hotplug_event(&ifbdev->helper); } |
