fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965: Make the driver compile until a proper libdrm can be released.

Browse source 
No depending on unreleased code.
This commit is contained in:
Eric Anholt 2013-11-08 10:49:47 -08:00 • committed by Kristian Høgsberg
parent f0f202e6b7
commit bd4596efac
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -714,12 +714,10 @@ brwCreateContext(gl_api api,
}
/* Notification of GPU resets requires hardware contexts and a kernel new
* enough to support DRM_IOCTL_I915_GET_RESET_STATS.
* enough to support DRM_IOCTL_I915_GET_RESET_STATS, which isn't upstream
* yet.
*/
if (notify_reset &&
(brw->hw_ctx == NULL
|| drm_intel_get_reset_stats(brw->hw_ctx, &brw->reset_count, NULL,
NULL))) {
if (notify_reset) {
/* This is the wrong error code, but the correct error code (one that
* will cause EGL to generate EGL_BAD_MATCH) doesn't seem to exist.
*/

7
src/mesa/drivers/dri/i965/brw_reset.c
View file

@ -42,10 +42,17 @@ brw_get_graphics_reset_status(struct gl_context *ctx)
*/
assert(brw->hw_ctx != NULL);
#if 0
/* This is waiting until the kernel code can be merged and a new libdrm
* actually released.
*/
err = drm_intel_get_reset_stats(brw->hw_ctx, &reset_count, &active,
&pending);
if (err)
return GL_NO_ERROR;
#else
return GL_NO_ERROR;
#endif
/* A reset was observed while a batch from this context was executing.
* Assume that this context was at fault.