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

Commit 5d56fe5f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-nouveau-next' of... 

Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-core-next

* 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (102 commits)
  drm/nouveau/ttm: fix crash as a result of a recent ttm change
  drm/nouveau: Fix notifier blocks over the 4GB mark.
  drm/nouveau: Fix pushbufs over the 4GB mark.
  drm/nvc0/pm: initial engine reclocking
  drm/nouveau: move hpd enable/disable to common code
  drm/nv40/disp: implement support for hotplug irq
  drm/nouveau/gpio: reimplement as nouveau_gpio.c, fixing a number of issues
  drm/nouveau: just pass gpio line to pwm_*, not entire gpio struct
  drm/nouveau/hwsq: remove some magic, give proper opcode names
  drm/nv50/pm: introduce hwsq-based memory reclocking
  drm/nv04/disp: handle dual-link spwg panels without needing quirks
  drm/nouveau/dp: remove broken display depth function, use the improved one
  drm/nouveau/mxm: implement ROM shadow method
  drm/nouveau/mxm: implement _DSM shadow method
  drm/nouveau/mxm: implement wmi shadow method
  drm/nouveau/mxm: initial implementation of dcb sanitisation
  drm/nouveau/disp: parse connector info directly in nouveau_connector.c
  drm/nouveau/i2c: handle bit-banging ourselves
  drm/nouveau/i2c: fix debug message
  drm/nouveau/i2c: tidy up bit-bang helpers, also fixing nv50 setsda bug
  ...
parents 4cf73129 f7b24c42

drivers/gpu/drm/nouveau/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 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_ramht.o \

             nouveau_hdmi.o nouveau_dp.o nouveau_ramht.o \

	     nouveau_pm.o nouveau_volt.o nouveau_perf.o nouveau_temp.o \

	     nouveau_mm.o nouveau_vm.o \

	     nouveau_mm.o nouveau_vm.o nouveau_mxm.o nouveau_gpio.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o nvc0_fb.o \
@@ -19,9 +19,12 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o nvc0_graph.o \

             nv40_grctx.o nv50_grctx.o nvc0_grctx.o \

             nv84_crypt.o \

             nv84_crypt.o nv98_crypt.o \

             nva3_copy.o nvc0_copy.o \

             nv31_mpeg.o nv50_mpeg.o \

             nv84_bsp.o \

             nv84_vp.o \

             nv98_ppp.o \

             nv04_instmem.o nv50_instmem.o nvc0_instmem.o \

             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \

             nv04_crtc.o nv04_display.o nv04_cursor.o \

drivers/gpu/drm/nouveau/nouveau_bios.c

+216 −688

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/nouveau/nouveau_bios.h

+20 −49
Original line number Diff line number Diff line
@@ -34,9 +34,14 @@ 


#define DCB_LOC_ON_CHIP 0



#define ROM16(x) le16_to_cpu(*(uint16_t *)&(x))

#define ROM32(x) le32_to_cpu(*(uint32_t *)&(x))

#define ROMPTR(bios, x) (ROM16(x) ? &(bios)->data[ROM16(x)] : NULL)

#define ROM16(x) le16_to_cpu(*(u16 *)&(x))

#define ROM32(x) le32_to_cpu(*(u32 *)&(x))

#define ROM48(x) ({ u8 *p = &(x); (u64)ROM16(p[4]) << 32 | ROM32(p[0]); })

#define ROM64(x) le64_to_cpu(*(u64 *)&(x))

#define ROMPTR(d,x) ({            \

	struct drm_nouveau_private *dev_priv = (d)->dev_private; \

	ROM16(x) ? &dev_priv->vbios.data[ROM16(x)] : NULL; \

})



struct bit_entry {

	uint8_t  id;
@@ -48,30 +53,12 @@ struct bit_entry { 


int bit_table(struct drm_device *, u8 id, struct bit_entry *);



struct dcb_i2c_entry {

	uint32_t entry;

	uint8_t port_type;

	uint8_t read, write;

	struct nouveau_i2c_chan *chan;

};



enum dcb_gpio_tag {

	DCB_GPIO_TVDAC0 = 0xc,

	DCB_GPIO_TVDAC1 = 0x2d,

};



struct dcb_gpio_entry {

	enum dcb_gpio_tag tag;

	int line;

	bool invert;

	uint32_t entry;

	uint8_t state_default;

	uint8_t state[2];

};



struct dcb_gpio_table {

	int entries;

	struct dcb_gpio_entry entry[DCB_MAX_NUM_GPIO_ENTRIES];

	DCB_GPIO_PWM_FAN = 0x9,

	DCB_GPIO_FAN_SENSE = 0x3d,

	DCB_GPIO_UNUSED = 0xff

};



enum dcb_connector_type {
@@ -90,20 +77,6 @@ enum dcb_connector_type { 
	DCB_CONNECTOR_NONE = 0xff

};



struct dcb_connector_table_entry {

	uint8_t index;

	uint32_t entry;

	enum dcb_connector_type type;

	uint8_t index2;

	uint8_t gpio_tag;

	void *drm;

};



struct dcb_connector_table {

	int entries;

	struct dcb_connector_table_entry entry[DCB_MAX_NUM_CONNECTOR_ENTRIES];

};



enum dcb_type {

	OUTPUT_ANALOG = 0,

	OUTPUT_TV = 1,
@@ -111,6 +84,7 @@ enum dcb_type { 
	OUTPUT_LVDS = 3,

	OUTPUT_DP = 6,

	OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */

	OUTPUT_UNUSED = 15,

	OUTPUT_ANY = -1

};
@@ -155,18 +129,8 @@ struct dcb_entry { 


struct dcb_table {

	uint8_t version;



	int entries;

	struct dcb_entry entry[DCB_MAX_NUM_ENTRIES];



	uint8_t *i2c_table;

	uint8_t i2c_default_indices;

	struct dcb_i2c_entry i2c[DCB_MAX_NUM_I2C_ENTRIES];



	uint16_t gpio_table_ptr;

	struct dcb_gpio_table gpio;

	uint16_t connector_table_ptr;

	struct dcb_connector_table connector;

};



enum nouveau_or {
@@ -195,7 +159,7 @@ enum pll_types { 
	PLL_SHADER = 0x02,

	PLL_UNK03  = 0x03,

	PLL_MEMORY = 0x04,

	PLL_UNK05  = 0x05,

	PLL_VDEC   = 0x05,

	PLL_UNK40  = 0x40,

	PLL_UNK41  = 0x41,

	PLL_UNK42  = 0x42,
@@ -333,4 +297,11 @@ struct nvbios { 
	} legacy;

};



void *dcb_table(struct drm_device *);

void *dcb_outp(struct drm_device *, u8 idx);

int dcb_outp_foreach(struct drm_device *, void *data,

		     int (*)(struct drm_device *, void *, int idx, u8 *outp));

u8 *dcb_conntab(struct drm_device *);

u8 *dcb_conn(struct drm_device *, u8 idx);



#endif

drivers/gpu/drm/nouveau/nouveau_bo.c

+3 −5
Original line number Diff line number Diff line
@@ -682,8 +682,7 @@ nouveau_vma_getmap(struct nouveau_channel *chan, struct nouveau_bo *nvbo, 
	if (mem->mem_type == TTM_PL_VRAM)

		nouveau_vm_map(vma, node);

	else

		nouveau_vm_map_sg(vma, 0, mem->num_pages << PAGE_SHIFT,

				  node, node->pages);

		nouveau_vm_map_sg(vma, 0, mem->num_pages << PAGE_SHIFT, node);



	return 0;

}
@@ -810,7 +809,6 @@ out: 
static void

nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem)

{

	struct nouveau_mem *node = new_mem->mm_node;

	struct nouveau_bo *nvbo = nouveau_bo(bo);

	struct nouveau_vma *vma;
@@ -822,7 +820,7 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, struct ttm_mem_reg *new_mem) 
		    nvbo->page_shift == vma->vm->spg_shift) {

			nouveau_vm_map_sg(vma, 0, new_mem->

					  num_pages << PAGE_SHIFT,

					  node, node->pages);

					  new_mem->mm_node);

		} else {

			nouveau_vm_unmap(vma);

		}
@@ -1173,7 +1171,7 @@ nouveau_bo_vma_add(struct nouveau_bo *nvbo, struct nouveau_vm *vm, 
		nouveau_vm_map(vma, nvbo->bo.mem.mm_node);

	else

	if (nvbo->bo.mem.mem_type == TTM_PL_TT)

		nouveau_vm_map_sg(vma, 0, size, node, node->pages);

		nouveau_vm_map_sg(vma, 0, size, node);



	list_add_tail(&vma->head, &nvbo->vma_list);

	vma->refcount = 1;

drivers/gpu/drm/nouveau/nouveau_channel.c

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,8 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret, 
	nouveau_dma_pre_init(chan);

	chan->user_put = 0x40;

	chan->user_get = 0x44;

	if (dev_priv->card_type >= NV_50)

                chan->user_get_hi = 0x60;



	/* disable the fifo caches */

	pfifo->reassign(dev, false);