From: Sandy Huang <hjc@rock-chips.com>
To: dri-devel@lists.freedesktop.org,
Xinliang Liu <z.liuxinliang@hisilicon.com>,
Rongrong Zou <zourongrong@gmail.com>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Sam Ravnborg <sam@ravnborg.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Gerd Hoffmann <kraxel@redhat.com>,
Harry Wentland <harry.wentland@amd.com>,
Neil Armstrong <narmstrong@baylibre.com>,
Sandy Huang <hjc@rock-chips.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>,
Chen Feng <puck.chen@hisilicon.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Benjamin Gaignard <benjamin.gaignard@linaro.org>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-kernel@vger.kernel.org
Subject: [PATCH 24/36] drm/hisilicon: use bpp instead of cpp for drm_format_info
Date: Mon, 23 Sep 2019 20:51:47 +0800 [thread overview]
Message-ID: <1569243119-183293-4-git-send-email-hjc@rock-chips.com> (raw)
In-Reply-To: <1569243119-183293-1-git-send-email-hjc@rock-chips.com>
cpp[BytePerPlane] can't describe the 10bit data format correctly,
So we use bpp[BitPerPlane] to instead cpp.
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
---
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
index cc4c417..6bfb327 100644
--- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
+++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c
@@ -122,11 +122,11 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,
writel(gpu_addr, priv->mmio + HIBMC_CRT_FB_ADDRESS);
- reg = state->fb->width * (state->fb->format->cpp[0]);
+ reg = state->fb->width * (state->fb->format->bpp[0] / 8);
/* now line_pad is 16 */
reg = PADDING(16, reg);
- line_l = state->fb->width * state->fb->format->cpp[0];
+ line_l = state->fb->width * state->fb->format->bpp[0] / 8;
line_l = PADDING(16, line_l);
writel(HIBMC_FIELD(HIBMC_CRT_FB_WIDTH_WIDTH, reg) |
HIBMC_FIELD(HIBMC_CRT_FB_WIDTH_OFFS, line_l),
@@ -136,7 +136,7 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane,
reg = readl(priv->mmio + HIBMC_CRT_DISP_CTL);
reg &= ~HIBMC_CRT_DISP_CTL_FORMAT_MASK;
reg |= HIBMC_FIELD(HIBMC_CRT_DISP_CTL_FORMAT,
- state->fb->format->cpp[0] * 8 / 16);
+ state->fb->format->bpp[0] / 16);
writel(reg, priv->mmio + HIBMC_CRT_DISP_CTL);
}
--
2.7.4
next prev parent reply other threads:[~2019-09-23 12:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-23 12:51 [PATCH 21/36] drm/vc4: " Sandy Huang
2019-09-23 12:51 ` [PATCH 22/36] drm/atmel-hlcdc: " Sandy Huang
2019-09-23 17:31 ` Sam Ravnborg
2019-09-23 12:51 ` [PATCH 23/36] drm/cirrus: " Sandy Huang
2019-09-23 12:51 ` Sandy Huang [this message]
2019-09-23 12:51 ` [PATCH 25/36] drm/imx: " Sandy Huang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1569243119-183293-4-git-send-email-hjc@rock-chips.com \
--to=hjc@rock-chips.com \
--cc=airlied@linux.ie \
--cc=benjamin.gaignard@linaro.org \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=harry.wentland@amd.com \
--cc=kong.kongxinwei@hisilicon.com \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=narmstrong@baylibre.com \
--cc=puck.chen@hisilicon.com \
--cc=rodrigo.vivi@intel.com \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=tzimmermann@suse.de \
--cc=z.liuxinliang@hisilicon.com \
--cc=zourongrong@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®