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

Revert "i965: Disable unused pipeline stages once at startup on Gen7+."

Browse source 
This reverts commit 6c966ccf07.

Apparently causes GPU hangs.

Conflicts:
	src/mesa/drivers/dri/i965/brw_state.h
	src/mesa/drivers/dri/i965/brw_state_upload.c
This commit is contained in:
Kenneth Graunke 2013-06-11 10:31:39 -07:00
parent 42adf5f0dd
commit 3dacb7d40b
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/drivers/dri/i965/brw_state.h
View file

@ -111,6 +111,7 @@ extern const struct brw_tracked_state gen7_cc_state_pointer;
extern const struct brw_tracked_state gen7_cc_viewport_state_pointer;
extern const struct brw_tracked_state gen7_clip_state;
extern const struct brw_tracked_state gen7_depth_stencil_state_pointer;
extern const struct brw_tracked_state gen7_disable_stages;
extern const struct brw_tracked_state gen7_ps_state;
extern const struct brw_tracked_state gen7_samplers;
extern const struct brw_tracked_state gen7_sbe_state;
@ -213,9 +214,6 @@ uint32_t
get_attr_override(const struct brw_vue_map *vue_map, int urb_entry_read_offset,
int fs_attr, bool two_side_color, uint32_t *max_source_attr);
/* gen7_disable.c */
void gen7_disable_unused_stages(struct brw_context *brw);
/* gen7_urb.c */
void gen7_allocate_push_constants(struct brw_context *brw);

2
src/mesa/drivers/dri/i965/brw_state_upload.c
View file

@ -210,6 +210,7 @@ static const struct brw_tracked_state *gen7_atoms[] =
&gen7_samplers,
&gen6_multisample_state,
&gen7_disable_stages,
&gen7_vs_state,
&gen7_sol_state,
&gen7_clip_state,
@ -253,7 +254,6 @@ brw_upload_initial_gpu_state(struct brw_context *brw)
if (intel->gen >= 7) {
gen7_allocate_push_constants(brw);
gen7_disable_unused_stages(brw);
}
}

13
src/mesa/drivers/dri/i965/gen7_disable.c
View file

@ -26,8 +26,8 @@
#include "brw_defines.h"
#include "intel_batchbuffer.h"
void
gen7_disable_unused_stages(struct brw_context *brw)
static void
disable_stages(struct brw_context *brw)
{
struct intel_context *intel = &brw->intel;
@ -123,3 +123,12 @@ gen7_disable_unused_stages(struct brw_context *brw)
OUT_BATCH(0);
ADVANCE_BATCH();
}
const struct brw_tracked_state gen7_disable_stages = {
.dirty = {
.mesa = 0,
.brw = BRW_NEW_CONTEXT,
.cache = 0,
},
.emit = disable_stages,
};