Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc67b17e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm 

Pull more drm fixes from Dave Airlie:
 "Although the tree built for me fine on arm here, it appears either
  header cleanups in next or some kconfig combo it breaks, so this
  contains a fix to mediatek to include dma-mapping.h explicitly.

  There was also one nouveau fix that came in late that I was going to
  leave until next week, but since I was sending this I thought it may
  as well be in here:

  mediatek:
   - fix build in some cases

  nouveau:
   - fix hang with i2c and mst docks"

* tag 'drm-fixes-2019-08-24' of git://anongit.freedesktop.org/drm/drm:
  drm/mediatek: include dma-mapping header
  drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX
parents 9140d8bd 7837951a

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/pm_runtime.h>

#include <linux/dma-mapping.h>



#include "mtk_drm_crtc.h"

#include "mtk_drm_ddp.h"

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

+17 −7
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
		u8 *ptr = msg->buf;



		while (remaining) {

			u8 cnt = (remaining > 16) ? 16 : remaining;

			u8 cmd;

			u8 cnt, retries, cmd;



			if (msg->flags & I2C_M_RD)

				cmd = 1;
@@ -51,10 +50,19 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
			if (mcnt || remaining > 16)

				cmd |= 4; /* MOT */



			ret = aux->func->xfer(aux, true, cmd, msg->addr, ptr, &cnt);

			if (ret < 0) {

				nvkm_i2c_aux_release(aux);

				return ret;

			for (retries = 0, cnt = 0;

			     retries < 32 && !cnt;

			     retries++) {

				cnt = min_t(u8, remaining, 16);

				ret = aux->func->xfer(aux, true, cmd,

						      msg->addr, ptr, &cnt);

				if (ret < 0)

					goto out;

			}

			if (!cnt) {

				AUX_TRACE(aux, "no data after 32 retries");

				ret = -EIO;

				goto out;

			}



			ptr += cnt;
@@ -64,8 +72,10 @@ nvkm_i2c_aux_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) 
		msg++;

	}



	ret = num;

out:

	nvkm_i2c_aux_release(aux);

	return num;

	return ret;

}



static u32