diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2020-11-24 12:15:28 +0000 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2020-11-25 21:58:35 +0100 |
| commit | ab43108d0dd48d287e1b5bb9cd4a969457ed9b0e (patch) | |
| tree | a3a6d1f49c51da3e04cfe644104e7759aad68e6d /drivers/gpu/drm/mcde/mcde_display.c | |
| parent | dma-buf/dma-resv: Respect num_fences when initializing the shared fence list. (diff) | |
| download | linux-dev-ab43108d0dd48d287e1b5bb9cd4a969457ed9b0e.tar.xz linux-dev-ab43108d0dd48d287e1b5bb9cd4a969457ed9b0e.zip | |
drm/mcde: fix masking and bitwise-or on variable val
The masking of val with ~MCDE_CRX1_CLKSEL_MASK is currently being
ignored because there seems to be a missing bitwise-or of val in the
following statement. Fix this by replacing the assignment of val
with a bitwise-or.
Fixes: d795fd322063 ("drm/mcde: Support DPI output")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Unused valued")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20201124121528.395681-1-colin.king@canonical.com
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/mcde/mcde_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mcde/mcde_display.c b/drivers/gpu/drm/mcde/mcde_display.c index d941026b940c..7c2e0b865441 100644 --- a/drivers/gpu/drm/mcde/mcde_display.c +++ b/drivers/gpu/drm/mcde/mcde_display.c @@ -738,7 +738,7 @@ static void mcde_configure_fifo(struct mcde *mcde, enum mcde_fifo fifo, } else { /* Use the MCDE clock for DSI */ val &= ~MCDE_CRX1_CLKSEL_MASK; - val = MCDE_CRX1_CLKSEL_MCDECLK << MCDE_CRX1_CLKSEL_SHIFT; + val |= MCDE_CRX1_CLKSEL_MCDECLK << MCDE_CRX1_CLKSEL_SHIFT; } writel(val, mcde->regs + cr1); spin_unlock(&mcde->fifo_crx1_lock); |