Merge drm/drm-next into drm-intel-next-queued
Some DSI and VBT pending patches from Hans will apply cleanly and with less ugly conflicts if they are rebuilt on top of other patches that recently landed on drm-next. Reference: https://patchwork.freedesktop.org/series/70952/ Cc: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com
This commit is contained in:
@@ -2240,7 +2240,7 @@ const struct dev_pm_ops i915_pm_ops = {
|
||||
static const struct file_operations i915_driver_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = drm_open,
|
||||
.release = drm_release,
|
||||
.release = drm_release_noglobal,
|
||||
.unlocked_ioctl = drm_ioctl,
|
||||
.mmap = i915_gem_mmap,
|
||||
.poll = drm_poll,
|
||||
|
Reference in New Issue
Block a user