Commit 2806280a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/kms/nv50-: use NVIDIA's headers for core update() 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 4daef27c

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

+12 −5
Original line number Diff line number Diff line
@@ -39,12 +39,19 @@ core507d_update(struct nv50_core *core, u32 *interlock, bool ntfy) 
	if ((ret = PUSH_WAIT(push, 5)))

		return ret;



	if (ntfy)

		PUSH_NVSQ(push, NV507D, 0x0084, 0x80000000 | NV50_DISP_CORE_NTFY);

	if (ntfy) {

		PUSH_MTHD(push, NV507D, SET_NOTIFIER_CONTROL,

			  NVDEF(NV507D, SET_NOTIFIER_CONTROL, MODE, WRITE) |

			  NVVAL(NV507D, SET_NOTIFIER_CONTROL, OFFSET, NV50_DISP_CORE_NTFY >> 2) |

			  NVDEF(NV507D, SET_NOTIFIER_CONTROL, NOTIFY, ENABLE));

	}



	PUSH_MTHD(push, NV507D, UPDATE, interlock[NV50_DISP_INTERLOCK_BASE] |

					interlock[NV50_DISP_INTERLOCK_OVLY] |

		  NVDEF(NV507D, UPDATE, NOT_DRIVER_FRIENDLY, FALSE) |

		  NVDEF(NV507D, UPDATE, NOT_DRIVER_UNFRIENDLY, FALSE) |

		  NVDEF(NV507D, UPDATE, INHIBIT_INTERRUPTS, FALSE));



	PUSH_NVSQ(push, NV507D, 0x0080, interlock[NV50_DISP_INTERLOCK_BASE] |

					interlock[NV50_DISP_INTERLOCK_OVLY],

				0x0084, 0x00000000);

	return PUSH_KICK(push);

}

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

+15 −7
Original line number Diff line number Diff line
@@ -55,15 +55,23 @@ corec37d_update(struct nv50_core *core, u32 *interlock, bool ntfy) 
	if ((ret = PUSH_WAIT(push, 9)))

		return ret;



	if (ntfy)

		PUSH_NVSQ(push, NVC37D, 0x020c, 0x00001000 | NV50_DISP_CORE_NTFY);

	if (ntfy) {

		PUSH_MTHD(push, NVC37D, SET_NOTIFIER_CONTROL,

			  NVDEF(NVC37D, SET_NOTIFIER_CONTROL, MODE, WRITE) |

			  NVVAL(NVC37D, SET_NOTIFIER_CONTROL, OFFSET, NV50_DISP_CORE_NTFY >> 4) |

			  NVDEF(NVC37D, SET_NOTIFIER_CONTROL, NOTIFY, ENABLE));

	}



	PUSH_NVSQ(push, NVC37D, 0x0218, interlock[NV50_DISP_INTERLOCK_CURS],

				0x021c, interlock[NV50_DISP_INTERLOCK_WNDW]);

	PUSH_NVSQ(push, NVC37D, 0x0200, 0x00000001);

	PUSH_MTHD(push, NVC37D, SET_INTERLOCK_FLAGS, interlock[NV50_DISP_INTERLOCK_CURS],

				SET_WINDOW_INTERLOCK_FLAGS, interlock[NV50_DISP_INTERLOCK_WNDW]);

	PUSH_MTHD(push, NVC37D, UPDATE, 0x00000001 |

		  NVDEF(NVC37D, UPDATE, SPECIAL_HANDLING, NONE) |

		  NVDEF(NVC37D, UPDATE, INHIBIT_INTERRUPTS, FALSE));



	if (ntfy)

		PUSH_NVSQ(push, NVC37D, 0x020c, 0x00000000);

	if (ntfy) {

		PUSH_MTHD(push, NVC37D, SET_NOTIFIER_CONTROL,

			  NVDEF(NVC37D, SET_NOTIFIER_CONTROL, NOTIFY, DISABLE));

	}



	return PUSH_KICK(push);

}