Module Name: src
Committed By: jmcneill
Date: Mon May 18 21:32:06 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_car.c
Log Message:
make sure the display controllar partition is powered on
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra_car.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.17 src/sys/arch/arm/nvidia/tegra_car.c:1.18
--- src/sys/arch/arm/nvidia/tegra_car.c:1.17 Mon May 18 20:36:42 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Mon May 18 21:32:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.17 2015/05/18 20:36:42 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.18 2015/05/18 21:32:05 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.17 2015/05/18 20:36:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.18 2015/05/18 21:32:05 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -641,6 +641,7 @@ tegra_car_dc_enable(u_int port)
bus_space_handle_t bsh;
bus_size_t src_reg;
uint32_t dev_bit;
+ u_int partid;
tegra_car_get_bs(&bst, &bsh);
@@ -648,10 +649,12 @@ tegra_car_dc_enable(u_int port)
case 0:
dev_bit = CAR_DEV_L_DISP1;
src_reg = CAR_CLKSRC_DISP1_REG;
+ partid = PMC_PARTID_DIS;
break;
case 1:
dev_bit = CAR_DEV_L_DISP2;
src_reg = CAR_CLKSRC_DISP2_REG;
+ partid = PMC_PARTID_DISB;
break;
default:
return EINVAL;
@@ -661,6 +664,10 @@ tegra_car_dc_enable(u_int port)
bus_space_write_4(bst, bsh, CAR_RST_DEV_L_SET_REG, dev_bit);
bus_space_write_4(bst, bsh, CAR_CLK_ENB_L_SET_REG, dev_bit);
+ /* Turn on power to display partition */
+ tegra_pmc_power(partid, true);
+ tegra_pmc_remove_clamping(partid);
+
/* Select PLLP for clock source */
bus_space_write_4(bst, bsh, src_reg,
__SHIFTIN(CAR_CLKSRC_DISP_SRC_PLLP_OUT0,
