Commit 13a86519 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/i2c/gf119-: add support for address-only transactions 



Since switching the I2C-over-AUX helpers, there have been regressions on
some display combinations due to us not having support for "address only"
transactions.

This commits enables support for them for GF119 and newer.

Earlier GPUs have been reverted to a custom I2C-over-AUX algorithm.

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

drivers/gpu/drm/nouveau/nouveau_connector.c

+0 −2
Original line number Diff line number Diff line
@@ -1158,8 +1158,6 @@ nouveau_connector_aux_xfer(struct drm_dp_aux *obj, struct drm_dp_aux_msg *msg) 
		return -ENODEV;

	if (WARN_ON(msg->size > 16))

		return -E2BIG;

	if (msg->size == 0)

		return msg->size;



	ret = nvkm_i2c_aux_acquire(aux);

	if (ret)

drivers/gpu/drm/nouveau/nv50_display.c

+11 −2
Original line number Diff line number Diff line
@@ -3674,15 +3674,24 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	drm_mode_connector_attach_encoder(connector, encoder);



	if (dcbe->type == DCB_OUTPUT_DP) {

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

		struct nvkm_i2c_aux *aux =

			nvkm_i2c_aux_find(i2c, dcbe->i2c_index);

		if (aux) {

			if (disp->disp->oclass < GF110_DISP) {

				/* HW has no support for address-only

				 * transactions, so we're required to

				 * use custom I2C-over-AUX code.

				 */

				nv_encoder->i2c = &aux->i2c;

			} else {

				nv_encoder->i2c = &nv_connector->aux.ddc;

			}

			nv_encoder->aux = aux;

		}



		/*TODO: Use DP Info Table to check for support. */

		if (nv50_disp(encoder->dev)->disp->oclass >= GF110_DISP) {

		if (disp->disp->oclass >= GF110_DISP) {

			ret = nv50_mstm_new(nv_encoder, &nv_connector->aux, 16,

					    nv_connector->base.base.id,

					    &nv_encoder->dp.mstm);

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ nvkm-y += nvkm/subdev/i2c/bit.o 


nvkm-y += nvkm/subdev/i2c/aux.o

nvkm-y += nvkm/subdev/i2c/auxg94.o

nvkm-y += nvkm/subdev/i2c/auxgf119.o

nvkm-y += nvkm/subdev/i2c/auxgm200.o



nvkm-y += nvkm/subdev/i2c/anx9805.o

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ int 
nvkm_i2c_aux_xfer(struct nvkm_i2c_aux *aux, bool retry, u8 type,

		  u32 addr, u8 *data, u8 *size)

{

	if (!*size && !aux->func->address_only) {

		AUX_ERR(aux, "address-only transaction dropped");

		return -ENOSYS;

	}

	return aux->func->xfer(aux, retry, type, addr, data, size);

}

drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "pad.h"



struct nvkm_i2c_aux_func {

	bool address_only;

	int  (*xfer)(struct nvkm_i2c_aux *, bool retry, u8 type,

		     u32 addr, u8 *data, u8 *size);

	int  (*lnk_ctl)(struct nvkm_i2c_aux *, int link_nr, int link_bw,
@@ -17,7 +18,12 @@ void nvkm_i2c_aux_del(struct nvkm_i2c_aux **); 
int nvkm_i2c_aux_xfer(struct nvkm_i2c_aux *, bool retry, u8 type,

		      u32 addr, u8 *data, u8 *size);



int g94_i2c_aux_new_(const struct nvkm_i2c_aux_func *, struct nvkm_i2c_pad *,

		     int, u8, struct nvkm_i2c_aux **);



int g94_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);

int g94_i2c_aux_xfer(struct nvkm_i2c_aux *, bool, u8, u32, u8 *, u8 *);

int gf119_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);

int gm200_i2c_aux_new(struct nvkm_i2c_pad *, int, u8, struct nvkm_i2c_aux **);



#define AUX_MSG(b,l,f,a...) do {                                               \

CRA Git | Maintained and supported by SUSTech CRA and CCSE