Commit 44f9e6c6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'nouveau/for-airlied' into drm-linus 

* nouveau/for-airlied:
  drm/nouveau: fix bug causing pinned buffers to lose their NO_EVICT flag
  drm/nv50: fix suspend/resume delays without firmware present
  drm/nouveau: prevent all channel creation if accel not available
  drm/nv50: fix two potential suspend/resume oopses
  drm/nv40: implement ctxprog/state generation
  drm/nv10: Add the initial graph context and soft methods needed for LMA.
  drm/nouveau: Fix up buffer eviction, and evict them to GART, if possible.
  drm/nouveau: Add proper error handling to nouveau_card_init
  drm/nv04: Fix NV04 set_operation software method.
  drm/nouveau: Kill global state in BIOS script interpreter
  drm/nouveau: Kill global state in NvShadowBIOS
  drm/nouveau: use drm debug levels
  drm/i2c/ch7006: Fix load detection false positives right after system init.
  drm/nv04-nv40: Fix "conflicting memory types" when saving/restoring VGA fonts.
parents 29ebdf92 37cb3e08

drivers/gpu/drm/i2c/ch7006_drv.c

+5 −0
Original line number Diff line number Diff line
@@ -408,6 +408,11 @@ static int ch7006_probe(struct i2c_client *client, const struct i2c_device_id *i 


	ch7006_info(client, "Detected version ID: %x\n", val);



	/* I don't know what this is for, but otherwise I get no

	 * signal.

	 */

	ch7006_write(client, 0x3d, 0x0);



	return 0;



fail:

drivers/gpu/drm/i2c/ch7006_mode.c

+0 −5
Original line number Diff line number Diff line
@@ -427,11 +427,6 @@ void ch7006_state_load(struct i2c_client *client, 
	ch7006_load_reg(client, state, CH7006_SUBC_INC7);

	ch7006_load_reg(client, state, CH7006_PLL_CONTROL);

	ch7006_load_reg(client, state, CH7006_CALC_SUBC_INC0);



	/* I don't know what this is for, but otherwise I get no

	 * signal.

	 */

	ch7006_write(client, 0x3d, 0x0);

}



void ch7006_state_save(struct i2c_client *client,

drivers/gpu/drm/nouveau/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -9,13 +9,14 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \

             nouveau_display.o nouveau_connector.o nouveau_fbcon.o \

	     nouveau_dp.o \

             nouveau_dp.o nouveau_grctx.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv40_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o \

             nv40_grctx.o \

             nv04_instmem.o nv50_instmem.o \

             nv50_crtc.o nv50_dac.o nv50_sor.o \

             nv50_cursor.o nv50_display.o nv50_fbcon.o \

drivers/gpu/drm/nouveau/nouveau_bios.c

+302 −319

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nouveau_bios.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ struct nvbios { 


	uint16_t pll_limit_tbl_ptr;

	uint16_t ram_restrict_tbl_ptr;

	uint8_t ram_restrict_group_count;



	uint16_t some_script_ptr; /* BIT I + 14 */

	uint16_t init96_tbl_ptr; /* BIT I + 16 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE