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

Commit 4b5c152a authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

drm/nouveau: Remove implicit argument from nv_wait(). 



Signed-off-by: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 35fd5b42

drivers/gpu/drm/nouveau/nouveau_dp.c

+2 −1
Original line number Diff line number Diff line
@@ -524,7 +524,8 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, 
		nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x80000000);

		nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl);

		nv_wr32(dev, NV50_AUXCH_CTRL(index), ctrl | 0x00010000);

		if (!nv_wait(NV50_AUXCH_CTRL(index), 0x00010000, 0x00000000)) {

		if (!nv_wait(dev, NV50_AUXCH_CTRL(index),

			     0x00010000, 0x00000000)) {

			NV_ERROR(dev, "expected bit 16 == 0, got 0x%08x\n",

				 nv_rd32(dev, NV50_AUXCH_CTRL(index)));

			ret = -EBUSY;

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static inline void nv_wr08(struct drm_device *dev, unsigned reg, u8 val) 
	iowrite8(val, dev_priv->mmio + reg);

}



#define nv_wait(reg, mask, val) \

#define nv_wait(dev, reg, mask, val) \

	nouveau_wait_until(dev, 2000000000ULL, (reg), (mask), (val))



/* PRAMIN access */

drivers/gpu/drm/nouveau/nouveau_state.c

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ bool nouveau_wait_until(struct drm_device *dev, uint64_t timeout, 
/* Waits for PGRAPH to go completely idle */

bool nouveau_wait_for_idle(struct drm_device *dev)

{

	if (!nv_wait(NV04_PGRAPH_STATUS, 0xffffffff, 0x00000000)) {

	if (!nv_wait(dev, NV04_PGRAPH_STATUS, 0xffffffff, 0x00000000)) {

		NV_ERROR(dev, "PGRAPH idle timed out with status 0x%08x\n",

			 nv_rd32(dev, NV04_PGRAPH_STATUS));

		return false;

drivers/gpu/drm/nouveau/nv50_cursor.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ nv50_cursor_fini(struct nouveau_crtc *nv_crtc) 
	NV_DEBUG_KMS(dev, "\n");



	nv_wr32(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx), 0);

	if (!nv_wait(NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx),

	if (!nv_wait(dev, NV50_PDISPLAY_CURSOR_CURSOR_CTRL2(idx),

		     NV50_PDISPLAY_CURSOR_CURSOR_CTRL2_STATUS, 0)) {

		NV_ERROR(dev, "timeout: CURSOR_CTRL2_STATUS == 0\n");

		NV_ERROR(dev, "CURSOR_CTRL2 = 0x%08x\n",

drivers/gpu/drm/nouveau/nv50_dac.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector) 


	nv_wr32(dev, NV50_PDISPLAY_DAC_DPMS_CTRL(or),

		0x00150000 | NV50_PDISPLAY_DAC_DPMS_CTRL_PENDING);

	if (!nv_wait(NV50_PDISPLAY_DAC_DPMS_CTRL(or),

	if (!nv_wait(dev, NV50_PDISPLAY_DAC_DPMS_CTRL(or),

		     NV50_PDISPLAY_DAC_DPMS_CTRL_PENDING, 0)) {

		NV_ERROR(dev, "timeout: DAC_DPMS_CTRL_PENDING(%d) == 0\n", or);

		NV_ERROR(dev, "DAC_DPMS_CTRL(%d) = 0x%08x\n", or,
@@ -130,7 +130,7 @@ nv50_dac_dpms(struct drm_encoder *encoder, int mode) 
	NV_DEBUG_KMS(dev, "or %d mode %d\n", or, mode);



	/* wait for it to be done */

	if (!nv_wait(NV50_PDISPLAY_DAC_DPMS_CTRL(or),

	if (!nv_wait(dev, NV50_PDISPLAY_DAC_DPMS_CTRL(or),

		     NV50_PDISPLAY_DAC_DPMS_CTRL_PENDING, 0)) {

		NV_ERROR(dev, "timeout: DAC_DPMS_CTRL_PENDING(%d) == 0\n", or);

		NV_ERROR(dev, "DAC_DPMS_CTRL(%d) = 0x%08x\n", or,