Commit d47c7f06 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.6' of git://github.com/skeggsb/linux into drm-next 



A couple of OOPS fixes, fixes for TU1xx if firmware isn't available,
better behaviour in the face of GPU faults, and a patch to make HD
audio work again after runpm changes.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ <CACAvsv4xcLF6Ahh7UYEesn-wBEksd2da+ghusBAdODMrH7Sz2A@mail.gmail.com
parents c689b069 c3463aed

drivers/gpu/drm/nouveau/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config DRM_NOUVEAU 
	select INPUT if ACPI && X86

	select THERMAL if ACPI && X86

	select ACPI_VIDEO if ACPI && X86

	select SND_HDA_COMPONENT if SND_HDA_CORE

	help

	  Choose this option for open-source NVIDIA support.

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

+111 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <linux/dma-mapping.h>

#include <linux/hdmi.h>

#include <linux/component.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_dp_helper.h>
@@ -476,12 +477,113 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	return 0;

}



/*

 * audio component binding for ELD notification

 */

static void

nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port)

{

	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)

		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 port, -1);

}



static int

nv50_audio_component_get_eld(struct device *kdev, int port, int pipe,

			     bool *enabled, unsigned char *buf, int max_bytes)

{

	struct drm_device *drm_dev = dev_get_drvdata(kdev);

	struct nouveau_drm *drm = nouveau_drm(drm_dev);

	struct drm_encoder *encoder;

	struct nouveau_encoder *nv_encoder;

	struct nouveau_connector *nv_connector;

	struct nouveau_crtc *nv_crtc;

	int ret = 0;



	*enabled = false;

	drm_for_each_encoder(encoder, drm->dev) {

		nv_encoder = nouveau_encoder(encoder);

		nv_connector = nouveau_encoder_connector_get(nv_encoder);

		nv_crtc = nouveau_crtc(encoder->crtc);

		if (!nv_connector || !nv_crtc || nv_crtc->index != port)

			continue;

		*enabled = drm_detect_monitor_audio(nv_connector->edid);

		if (*enabled) {

			ret = drm_eld_size(nv_connector->base.eld);

			memcpy(buf, nv_connector->base.eld,

			       min(max_bytes, ret));

		}

		break;

	}

	return ret;

}



static const struct drm_audio_component_ops nv50_audio_component_ops = {

	.get_eld = nv50_audio_component_get_eld,

};



static int

nv50_audio_component_bind(struct device *kdev, struct device *hda_kdev,

			  void *data)

{

	struct drm_device *drm_dev = dev_get_drvdata(kdev);

	struct nouveau_drm *drm = nouveau_drm(drm_dev);

	struct drm_audio_component *acomp = data;



	if (WARN_ON(!device_link_add(hda_kdev, kdev, DL_FLAG_STATELESS)))

		return -ENOMEM;



	drm_modeset_lock_all(drm_dev);

	acomp->ops = &nv50_audio_component_ops;

	acomp->dev = kdev;

	drm->audio.component = acomp;

	drm_modeset_unlock_all(drm_dev);

	return 0;

}



static void

nv50_audio_component_unbind(struct device *kdev, struct device *hda_kdev,

			    void *data)

{

	struct drm_device *drm_dev = dev_get_drvdata(kdev);

	struct nouveau_drm *drm = nouveau_drm(drm_dev);

	struct drm_audio_component *acomp = data;



	drm_modeset_lock_all(drm_dev);

	drm->audio.component = NULL;

	acomp->ops = NULL;

	acomp->dev = NULL;

	drm_modeset_unlock_all(drm_dev);

}



static const struct component_ops nv50_audio_component_bind_ops = {

	.bind   = nv50_audio_component_bind,

	.unbind = nv50_audio_component_unbind,

};



static void

nv50_audio_component_init(struct nouveau_drm *drm)

{

	if (!component_add(drm->dev->dev, &nv50_audio_component_bind_ops))

		drm->audio.component_registered = true;

}



static void

nv50_audio_component_fini(struct nouveau_drm *drm)

{

	if (drm->audio.component_registered) {

		component_del(drm->dev->dev, &nv50_audio_component_bind_ops);

		drm->audio.component_registered = false;

	}

}



/******************************************************************************

 * Audio

 *****************************************************************************/

static void

nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc)

{

	struct nouveau_drm *drm = nouveau_drm(encoder->dev);

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nv50_disp *disp = nv50_disp(encoder->dev);

	struct {
@@ -496,11 +598,14 @@ nv50_audio_disable(struct drm_encoder *encoder, struct nouveau_crtc *nv_crtc) 
	};



	nvif_mthd(&disp->disp->object, 0, &args, sizeof(args));



	nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index);

}



static void

nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode)

{

	struct nouveau_drm *drm = nouveau_drm(encoder->dev);

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct nouveau_crtc *nv_crtc = nouveau_crtc(encoder->crtc);

	struct nouveau_connector *nv_connector;
@@ -527,6 +632,8 @@ nv50_audio_enable(struct drm_encoder *encoder, struct drm_display_mode *mode) 


	nvif_mthd(&disp->disp->object, 0, &args,

		  sizeof(args.base) + drm_eld_size(args.data));



	nv50_audio_component_eld_notify(drm->audio.component, nv_crtc->index);

}



/******************************************************************************
@@ -2296,6 +2403,8 @@ nv50_display_destroy(struct drm_device *dev) 
{

	struct nv50_disp *disp = nv50_disp(dev);



	nv50_audio_component_fini(nouveau_drm(dev));



	nv50_core_del(&disp->core);



	nouveau_bo_unmap(disp->sync);
@@ -2444,6 +2553,8 @@ nv50_display_create(struct drm_device *dev) 
	/* Disable vblank irqs aggressively for power-saving, safe on nv50+ */

	dev->vblank_disable_immediate = true;



	nv50_audio_component_init(drm);



out:

	if (ret)

		nv50_display_destroy(dev);

drivers/gpu/drm/nouveau/nouveau_chan.c

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ nouveau_channel_killed(struct nvif_notify *ntfy) 
	struct nouveau_cli *cli = (void *)chan->user.client;

	NV_PRINTK(warn, cli, "channel %d killed!\n", chan->chid);

	atomic_set(&chan->killed, 1);

	if (chan->fence)

		nouveau_fence_context_kill(chan->fence, -ENODEV);

	return NVIF_NOTIFY_DROP;

}

drivers/gpu/drm/nouveau/nouveau_drv.h

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ 
#include <drm/ttm/ttm_module.h>

#include <drm/ttm/ttm_page_alloc.h>



#include <drm/drm_audio_component.h>



#include "uapi/drm/nouveau_drm.h"



struct nouveau_channel;
@@ -211,6 +213,11 @@ struct nouveau_drm { 
	struct nouveau_svm *svm;



	struct nouveau_dmem *dmem;



	struct {

		struct drm_audio_component *component;

		bool component_registered;

	} audio;

};



static inline struct nouveau_drm *

drivers/gpu/drm/nouveau/nouveau_fence.c

+9 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ nouveau_local_fence(struct dma_fence *fence, struct nouveau_drm *drm) 
}



void

nouveau_fence_context_del(struct nouveau_fence_chan *fctx)

nouveau_fence_context_kill(struct nouveau_fence_chan *fctx, int error)

{

	struct nouveau_fence *fence;
@@ -95,11 +95,19 @@ nouveau_fence_context_del(struct nouveau_fence_chan *fctx) 
	while (!list_empty(&fctx->pending)) {

		fence = list_entry(fctx->pending.next, typeof(*fence), head);



		if (error)

			dma_fence_set_error(&fence->base, error);



		if (nouveau_fence_signal(fence))

			nvif_notify_put(&fctx->notify);

	}

	spin_unlock_irq(&fctx->lock);

}



void

nouveau_fence_context_del(struct nouveau_fence_chan *fctx)

{

	nouveau_fence_context_kill(fctx, 0);

	nvif_notify_fini(&fctx->notify);

	fctx->dead = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE