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

Commit 1f4f8eea authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (22 commits)
  Revert "i915: restore only the mode of this driver on lastclose"
  Revert "ttm: Utilize the DMA API for pages that have TTM_PAGE_FLAG_DMA32 set."
  i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO
  drm/radeon/kms: properly program vddci on evergreen+
  drm/radeon/kms: add voltage type to atom set voltage function
  drm/radeon/kms: fix pcie_p callbacks on btc and cayman
  drm/radeon/kms: fix suspend on rv530 asics
  drm/radeon/kms: clean up gart dummy page handling
  drm/radeon/kms: make radeon i2c put/get bytes less noisy
  drm/radeon/kms: pll tweaks for rv6xx
  drm/radeon: Fix KMS legacy backlight support if CONFIG_BACKLIGHT_CLASS_DEVICE=m.
  radeon: Fix KMS CP writeback on big endian machines.
  i915: restore only the mode of this driver on lastclose
  drm/nvc0: improve vm flush function
  drm/nv50-nvc0: remove some code that doesn't belong here
  drm/nv50: use "nv86" tlb flush method on everything except 0x50/0xac
  drm/nouveau: quirk for XFX GT-240X-YA
  drm/nv50-nvc0: work around an evo channel hang that some people see
  drm/nouveau: implement init table opcode 0x5c
  drm/nouveau: fix oops on unload with disabled LVDS panel
  ...
parents 6631e635 2582b6ef

drivers/gpu/drm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config DRM_I915 
	# i915 depends on ACPI_VIDEO when ACPI is enabled

	# but for select to work, need to select ACPI_VIDEO's dependencies, ick

	select BACKLIGHT_CLASS_DEVICE if ACPI

	select VIDEO_OUTPUT_CONTROL if ACPI

	select INPUT if ACPI

	select ACPI_VIDEO if ACPI

	select ACPI_BUTTON if ACPI

drivers/gpu/drm/nouveau/nouveau_bios.c

+50 −3
Original line number Diff line number Diff line
@@ -269,7 +269,7 @@ struct init_tbl_entry { 
	int (*handler)(struct nvbios *, uint16_t, struct init_exec *);

};



static int parse_init_table(struct nvbios *, unsigned int, struct init_exec *);

static int parse_init_table(struct nvbios *, uint16_t, struct init_exec *);



#define MACRO_INDEX_SIZE	2

#define MACRO_SIZE		8
@@ -2010,6 +2010,27 @@ init_sub_direct(struct nvbios *bios, uint16_t offset, struct init_exec *iexec) 
	return 3;

}



static int

init_jump(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)

{

	/*

	 * INIT_JUMP   opcode: 0x5C ('\')

	 *

	 * offset      (8  bit): opcode

	 * offset + 1  (16 bit): offset (in bios)

	 *

	 * Continue execution of init table from 'offset'

	 */



	uint16_t jmp_offset = ROM16(bios->data[offset + 1]);



	if (!iexec->execute)

		return 3;



	BIOSLOG(bios, "0x%04X: Jump to 0x%04X\n", offset, jmp_offset);

	return jmp_offset - offset;

}



static int

init_i2c_if(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)

{
@@ -3659,6 +3680,7 @@ static struct init_tbl_entry itbl_entry[] = { 
	{ "INIT_ZM_REG_SEQUENCE"              , 0x58, init_zm_reg_sequence            },

	/* INIT_INDIRECT_REG (0x5A, 7, 0, 0) removed due to no example of use */

	{ "INIT_SUB_DIRECT"                   , 0x5B, init_sub_direct                 },

	{ "INIT_JUMP"                         , 0x5C, init_jump                       },

	{ "INIT_I2C_IF"                       , 0x5E, init_i2c_if                     },

	{ "INIT_COPY_NV_REG"                  , 0x5F, init_copy_nv_reg                },

	{ "INIT_ZM_INDEX_IO"                  , 0x62, init_zm_index_io                },
@@ -3700,8 +3722,7 @@ static struct init_tbl_entry itbl_entry[] = { 
#define MAX_TABLE_OPS 1000



static int

parse_init_table(struct nvbios *bios, unsigned int offset,

		 struct init_exec *iexec)

parse_init_table(struct nvbios *bios, uint16_t offset, struct init_exec *iexec)

{

	/*

	 * Parses all commands in an init table.
@@ -6333,6 +6354,32 @@ apply_dcb_encoder_quirks(struct drm_device *dev, int idx, u32 *conn, u32 *conf) 
		}

	}



	/* XFX GT-240X-YA

	 *

	 * So many things wrong here, replace the entire encoder table..

	 */

	if (nv_match_device(dev, 0x0ca3, 0x1682, 0x3003)) {

		if (idx == 0) {

			*conn = 0x02001300; /* VGA, connector 1 */

			*conf = 0x00000028;

		} else

		if (idx == 1) {

			*conn = 0x01010312; /* DVI, connector 0 */

			*conf = 0x00020030;

		} else

		if (idx == 2) {

			*conn = 0x01010310; /* VGA, connector 0 */

			*conf = 0x00000028;

		} else

		if (idx == 3) {

			*conn = 0x02022362; /* HDMI, connector 2 */

			*conf = 0x00020010;

		} else {

			*conn = 0x0000000e; /* EOL */

			*conf = 0x00000000;

		}

	}



	return true;

}

drivers/gpu/drm/nouveau/nouveau_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ extern int nv50_graph_load_context(struct nouveau_channel *); 
extern int  nv50_graph_unload_context(struct drm_device *);

extern int  nv50_grctx_init(struct nouveau_grctx *);

extern void nv50_graph_tlb_flush(struct drm_device *dev);

extern void nv86_graph_tlb_flush(struct drm_device *dev);

extern void nv84_graph_tlb_flush(struct drm_device *dev);

extern struct nouveau_enum nv50_data_error_names[];



/* nvc0_graph.c */

drivers/gpu/drm/nouveau/nouveau_mem.c

+49 −27
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ nouveau_mem_timing_init(struct drm_device *dev) 
	u8 tRC;		/* Byte 9 */

	u8 tUNK_10, tUNK_11, tUNK_12, tUNK_13, tUNK_14;

	u8 tUNK_18, tUNK_19, tUNK_20, tUNK_21;

	u8 magic_number = 0; /* Yeah... sorry*/

	u8 *mem = NULL, *entry;

	int i, recordlen, entries;
@@ -596,6 +597,12 @@ nouveau_mem_timing_init(struct drm_device *dev) 
	if (!memtimings->timing)

		return;



	/* Get "some number" from the timing reg for NV_40

	 * Used in calculations later */

	if(dev_priv->card_type == NV_40) {

		magic_number = (nv_rd32(dev,0x100228) & 0x0f000000) >> 24;

	}



	entry = mem + mem[1];

	for (i = 0; i < entries; i++, entry += recordlen) {

		struct nouveau_pm_memtiming *timing = &pm->memtimings.timing[i];
@@ -635,36 +642,51 @@ nouveau_mem_timing_init(struct drm_device *dev) 


		/* XXX: I don't trust the -1's and +1's... they must come

		 *      from somewhere! */

		timing->reg_100224 = ((tUNK_0 + tUNK_19 + 1) << 24 |

		timing->reg_100224 = (tUNK_0 + tUNK_19 + 1 + magic_number) << 24 |

				      tUNK_18 << 16 |

				      (tUNK_1 + tUNK_19 + 1) << 8 |

				      (tUNK_2 - 1));

				      (tUNK_1 + tUNK_19 + 1 + magic_number) << 8;

		if(dev_priv->chipset == 0xa8) {

			timing->reg_100224 |= (tUNK_2 - 1);

		} else {

			timing->reg_100224 |= (tUNK_2 + 2 - magic_number);

		}



		timing->reg_100228 = (tUNK_12 << 16 | tUNK_11 << 8 | tUNK_10);

		if(recordlen > 19) {

			timing->reg_100228 += (tUNK_19 - 1) << 24;

		}/* I cannot back-up this else-statement right now

			 else {

			timing->reg_100228 += tUNK_12 << 24;

		}*/

		if(dev_priv->chipset >= 0xa3 && dev_priv->chipset < 0xaa) {

			timing->reg_100228 |= (tUNK_19 - 1) << 24;

		}



		if(dev_priv->card_type == NV_40) {

			/* NV40: don't know what the rest of the regs are..

			 * And don't need to know either */

			timing->reg_100228 |= 0x20200000 | magic_number << 24;

		} else if(dev_priv->card_type >= NV_50) {

			/* XXX: reg_10022c */

			timing->reg_10022c = tUNK_2 - 1;



			timing->reg_100230 = (tUNK_20 << 24 | tUNK_21 << 16 |

						  tUNK_13 << 8  | tUNK_13);



		/* XXX: +6? */

		timing->reg_100234 = (tRAS << 24 | (tUNK_19 + 6) << 8 | tRC);

			timing->reg_100234 = (tRAS << 24 | tRC);

			timing->reg_100234 += max(tUNK_10,tUNK_11) << 16;



			if(dev_priv->chipset < 0xa3) {

				timing->reg_100234 |= (tUNK_2 + 2) << 8;

			} else {

				/* XXX: +6? */

				timing->reg_100234 |= (tUNK_19 + 6) << 8;

			}



			/* XXX; reg_100238, reg_10023c

		 * reg: 0x00??????

		 * reg_10023c:

		 *      0 for pre-NV50 cards

		 *      0x????0202 for NV50+ cards (empirical evidence) */

		if(dev_priv->card_type >= NV_50) {

			 * reg_100238: 0x00??????

			 * reg_10023c: 0x!!??0202 for NV50+ cards (empirical evidence) */

			timing->reg_10023c = 0x202;

			if(dev_priv->chipset < 0xa3) {

				timing->reg_10023c |= 0x4000000 | (tUNK_2 - 1) << 16;

			} else {

				/* currently unknown

				 * 10023c seen as 06xxxxxx, 0bxxxxxx or 0fxxxxxx */

			}

		}



		NV_DEBUG(dev, "Entry %d: 220: %08x %08x %08x %08x\n", i,

drivers/gpu/drm/nouveau/nouveau_perf.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ nouveau_perf_init(struct drm_device *dev) 
		case 0x13:

		case 0x15:

			perflvl->fanspeed = entry[55];

			perflvl->voltage = entry[56];

			perflvl->voltage = (recordlen > 56) ? entry[56] : 0;

			perflvl->core = ROM32(entry[1]) * 10;

			perflvl->memory = ROM32(entry[5]) * 20;

			break;