Commit cbb4b608 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50: remove some unnecessary PDISPLAY init 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 9acc8100

drivers/gpu/drm/nouveau/nv50_display.c

+2 −13
Original line number Diff line number Diff line
@@ -218,9 +218,9 @@ nv50_display_init(struct drm_device *dev) 
	struct nouveau_gpio_engine *pgpio = &dev_priv->engine.gpio;

	struct nouveau_channel *evo = dev_priv->evo;

	struct drm_connector *connector;

	uint32_t val, ram_amount;

	uint64_t start;

	int ret, i;

	u64 start;

	u32 val;



	NV_DEBUG_KMS(dev, "\n");
@@ -262,17 +262,6 @@ nv50_display_init(struct drm_device *dev) 
		nv_wr32(dev, NV50_PDISPLAY_DAC_CLK_CTRL1(i), 0x00000001);

	}



	/* This used to be in crtc unblank, but seems out of place there. */

	nv_wr32(dev, NV50_PDISPLAY_UNK_380, 0);

	/* RAM is clamped to 256 MiB. */

	ram_amount = dev_priv->vram_size;

	NV_DEBUG_KMS(dev, "ram_amount %d\n", ram_amount);

	if (ram_amount > 256*1024*1024)

		ram_amount = 256*1024*1024;

	nv_wr32(dev, NV50_PDISPLAY_RAM_AMOUNT, ram_amount - 1);

	nv_wr32(dev, NV50_PDISPLAY_UNK_388, 0x150000);

	nv_wr32(dev, NV50_PDISPLAY_UNK_38C, 0);



	/* The precise purpose is unknown, i suspect it has something to do

	 * with text mode.

	 */