diff options
| author | Robin Peng <robinpeng@google.com> | 2023-04-17 11:04:27 +0000 |
|---|---|---|
| committer | Shiyong Li <shiyongli@google.com> | 2023-04-17 17:27:14 +0000 |
| commit | 20a4503f064f63146bdc557b08024cdbcdac32e9 (patch) | |
| tree | 247d1e6ea94f8fbd0d75f8d77551e6e258864175 | |
| parent | d8df397caa8dae458675cb0698457ce2001980a3 (diff) | |
| parent | 3373c1b898c22fa41641d3aa2c11a25a685af5c4 (diff) | |
| download | display-20a4503f064f63146bdc557b08024cdbcdac32e9.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
Bug: 255246572
Change-Id: Idd002e6ca61c6f950d2e6e0f059fffe997dbab76
Signed-off-by: Robin Peng <robinpeng@google.com>
| -rw-r--r-- | samsung/exynos_drm_decon.c | 2 | ||||
| -rw-r--r-- | samsung/panel/panel-samsung-drv.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/samsung/exynos_drm_decon.c b/samsung/exynos_drm_decon.c index fba4326..5330a86 100644 --- a/samsung/exynos_drm_decon.c +++ b/samsung/exynos_drm_decon.c @@ -2173,6 +2173,8 @@ static int decon_probe(struct platform_device *pdev) if (!decon) return -ENOMEM; + dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + decon->dev = dev; ret = decon_parse_dt(decon, dev->of_node); diff --git a/samsung/panel/panel-samsung-drv.h b/samsung/panel/panel-samsung-drv.h index de04692..db57213 100644 --- a/samsung/panel/panel-samsung-drv.h +++ b/samsung/panel/panel-samsung-drv.h @@ -923,7 +923,7 @@ static inline bool is_local_hbm_disabled(struct exynos_panel *ctx) i > 0; \ i--, data++) \ -#define EXYNOS_VREFRESH_TO_PERIOD_USEC(rate) DIV_ROUND_UP(USEC_PER_SEC, (rate) ?: 60) +#define EXYNOS_VREFRESH_TO_PERIOD_USEC(rate) DIV_ROUND_UP(USEC_PER_SEC, (rate) ? (rate) : 60) int exynos_panel_wait_for_vblank(struct exynos_panel *ctx); void exynos_panel_wait_for_vsync_done(struct exynos_panel *ctx, u32 te_us, u32 period_us); |