Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e
("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
@@ -641,7 +641,7 @@ static bool intel_fbdev_init_bios(struct drm_device *dev,
|
||||
if (!crtc->state->active)
|
||||
continue;
|
||||
|
||||
WARN(!crtc->primary->fb,
|
||||
WARN(!crtc->primary->state->fb,
|
||||
"re-used BIOS config but lost an fb on crtc %d\n",
|
||||
crtc->base.id);
|
||||
}
|
||||
|
Reference in New Issue
Block a user