Commit 52c7bcdb authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/hdmi: add hdmi register accessors to handle hdmi block move 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 25575b41

drivers/gpu/drm/nouveau/nouveau_hdmi.c

+32 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "nouveau_drv.h"

#include "nouveau_connector.h"

#include "nouveau_encoder.h"

#include "nouveau_crtc.h"



static bool

hdmi_sor(struct drm_encoder *encoder)
@@ -36,12 +37,42 @@ hdmi_sor(struct drm_encoder *encoder) 
	return true;

}



static inline u32

hdmi_base(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

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

	if (!hdmi_sor(encoder))

		return 0x616500 + (nv_crtc->index * 0x800);

	return 0x61c500 + (nv_encoder->or * 0x800);

}



static void

hdmi_wr32(struct drm_encoder *encoder, u32 reg, u32 val)

{

	nv_wr32(encoder->dev, hdmi_base(encoder) + reg, val);

}



static u32

hdmi_rd32(struct drm_encoder *encoder, u32 reg)

{

	return nv_rd32(encoder->dev, hdmi_base(encoder) + reg);

}



static u32

hdmi_mask(struct drm_encoder *encoder, u32 reg, u32 mask, u32 val)

{

	u32 tmp = hdmi_rd32(encoder, reg);

	hdmi_wr32(encoder, reg, (tmp & ~mask) | val);

	return tmp;

}



static void

nouveau_audio_disconnect(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);

	struct drm_device *dev = encoder->dev;

	int or = nv_encoder->or * 0x800;

	u32 or = nv_encoder->or * 0x800;



	if (hdmi_sor(encoder)) {

		nv_mask(dev, 0x61c448 + or, 0x00000003, 0x00000000);

drivers/gpu/drm/nouveau/nv50_sor.c

+3 −3
Original line number Diff line number Diff line
@@ -195,6 +195,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 


	NV_DEBUG_KMS(dev, "or %d type %d -> crtc %d\n",

		     nv_encoder->or, nv_encoder->dcb->type, crtc->index);

	nv_encoder->crtc = encoder->crtc;



	switch (nv_encoder->dcb->type) {

	case OUTPUT_TMDS:
@@ -206,7 +207,7 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
		} else

			mode_ctl = 0x0200;



		nouveau_hdmi_mode_set(encoder, mode);

		nouveau_hdmi_mode_set(encoder, adjusted_mode);

		break;

	case OUTPUT_DP:

		nv_connector = nouveau_encoder_connector_get(nv_encoder);
@@ -243,12 +244,11 @@ nv50_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, 
	ret = RING_SPACE(evo, 2);

	if (ret) {

		NV_ERROR(dev, "no space while connecting SOR\n");

		nv_encoder->crtc = NULL;

		return;

	}

	BEGIN_RING(evo, 0, NV50_EVO_SOR(nv_encoder->or, MODE_CTRL), 1);

	OUT_RING(evo, mode_ctl);



	nv_encoder->crtc = encoder->crtc;

}



static struct drm_crtc *