diff options
| -rw-r--r-- | arch/riscv/configs/starfive_jh7110_defconfig | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/verisilicon/vs_dc.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index fae319468d53..09ea78f4d188 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -206,9 +206,9 @@ CONFIG_VIDEO_STF_VIN=y CONFIG_VIN_SENSOR_SC2235=y CONFIG_VIN_SENSOR_OV4689=y CONFIG_VIN_SENSOR_IMX219=y -CONFIG_VIDEO_IMX708=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_WAVE_VPU=m +CONFIG_VIDEO_IMX708=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_VERISILICON=y CONFIG_STARFIVE_INNO_HDMI=y @@ -329,7 +329,6 @@ CONFIG_DEBUG_TIMEKEEPING=y CONFIG_DEBUG_RT_MUTEXES=y CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_RWSEMS=y -CONFIG_DEBUG_ATOMIC_SLEEP=y CONFIG_STACKTRACE=y CONFIG_DEBUG_LIST=y CONFIG_DEBUG_PLIST=y diff --git a/drivers/gpu/drm/verisilicon/vs_dc.c b/drivers/gpu/drm/verisilicon/vs_dc.c index ad41dfb13b41..9669272208f4 100644 --- a/drivers/gpu/drm/verisilicon/vs_dc.c +++ b/drivers/gpu/drm/verisilicon/vs_dc.c @@ -411,7 +411,7 @@ static int vs_dc_dc8200_get_clock(struct device *dev, struct vs_dc *dc) return 0; } -static int vs_dc_dc8200_clock_enable(struct device *dev, struct vs_dc *dc) +static int vs_dc_dc8200_clock_enable(struct device *dev, struct vs_dc *dc) { int ret; /*clk_prepare_enable(dc->sys_clk);*/ @@ -459,7 +459,7 @@ static void vs_vout_reset_get(struct device *dev, struct vs_dc *dc) dc->rst_vout_src = reset_control_get_shared(dev, "rst_vout_src"); if (IS_ERR(dc->rst_vout_src)) dev_err(dev, "failed to get rst_vout_src\n"); - dc->noc_disp = reset_control_get_shared(dev, "rst_noc_disp"); + dc->noc_disp = reset_control_get_exclusive(dev, "rst_noc_disp"); if (IS_ERR(dc->noc_disp)) dev_err(dev, "failed to get rst_noc_disp\n"); } @@ -467,7 +467,7 @@ static void vs_vout_reset_get(struct device *dev, struct vs_dc *dc) static void vs_vout_reset_deassert(struct vs_dc *dc) { reset_control_deassert(dc->rst_vout_src);//no! - reset_control_deassert(dc->noc_disp);//ok + //reset_control_deassert(dc->noc_disp);//ok } /* @@ -536,6 +536,7 @@ static int dc_vout_clk_enable(struct device *dev, struct vs_dc *dc) dev_err(dev, "failed to enable clock\n"); return ret; } + reset_control_deassert(dc->noc_disp); ret = vs_dc_vouttop_clock_enable(dev, dc); if (ret) { |