Commit fa1232ea authored May 11, 2020 by Lyude Paul Committed by Ben Skeggs May 22, 2020

drm/nouveau/kms/nv50-: Initialize core channel in nouveau_display_create()



We'll need the core channel initialized and ready by the time that we
start creating modesetting objects, so that we can call the
NV507D_GET_CAPABILITIES method to make the hardware expose it's
modesetting capabilities for later probing.

So, when loading the driver prepare the core channel from within
nouveau_display_create(). Everywhere else, we initialize the core
channel during resume.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent 0435d7c6

drivers/gpu/drm/nouveau/dispnv50/disp.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2373,6 +2373,7 @@ nv50_display_init(struct drm_device *dev, bool resume, bool runtime)
		struct drm_encoder *encoder;
		struct drm_plane *plane;

		if (resume \|\| runtime)
		core->func->init(core);

		list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
		@@ -2460,6 +2461,8 @@ nv50_display_create(struct drm_device *dev)
		if (ret)
		goto out;

		disp->core->func->init(disp->core);

		/* Assign the correct format modifiers */
		if (disp->disp->object.oclass >= TU102_DISP)
		nouveau_display(dev)->format_modifiers = wndwc57e_modifiers;

Admin message