From: Paul Cercueil <paul@crapouillou.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Sam Ravnborg <sam@ravnborg.org>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-next@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>
Subject: [PATCH] drm/ingenic: Fix bad revert
Date: Mon, 12 Oct 2020 12:25:09 +0200 [thread overview]
Message-ID: <20201012102509.10690-1-paul@crapouillou.net> (raw)
In-Reply-To: <20201012152452.432c4867@canb.auug.org.au>
Fix a badly reverted commit. The revert commit was cherry-picked from
drm-misc-next to drm-misc-next-fixes, and in the process some unrelated
code was added.
Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached""
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 1be1235bd546..a3d1617d7c67 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
}
}
-static void ingenic_drm_update_palette(struct ingenic_drm *priv,
- const struct drm_color_lut *lut)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
- u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
- | drm_color_lut_extract(lut[i].green, 6) << 5
- | drm_color_lut_extract(lut[i].blue, 5);
-
- priv->dma_hwdescs->palette[i] = color;
- }
-}
-
static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *oldstate)
{
@@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
dma_addr_t addr;
if (state && state->fb) {
- crtc_state = state->crtc->state;
-
addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
width = state->src_w >> 16;
height = state->src_h >> 16;
--
2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Paul Cercueil <paul@crapouillou.net>,
linux-next@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH] drm/ingenic: Fix bad revert
Date: Mon, 12 Oct 2020 12:25:09 +0200 [thread overview]
Message-ID: <20201012102509.10690-1-paul@crapouillou.net> (raw)
In-Reply-To: <20201012152452.432c4867@canb.auug.org.au>
Fix a badly reverted commit. The revert commit was cherry-picked from
drm-misc-next to drm-misc-next-fixes, and in the process some unrelated
code was added.
Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached""
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 1be1235bd546..a3d1617d7c67 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
}
}
-static void ingenic_drm_update_palette(struct ingenic_drm *priv,
- const struct drm_color_lut *lut)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
- u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
- | drm_color_lut_extract(lut[i].green, 6) << 5
- | drm_color_lut_extract(lut[i].blue, 5);
-
- priv->dma_hwdescs->palette[i] = color;
- }
-}
-
static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *oldstate)
{
@@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
dma_addr_t addr;
if (state && state->fb) {
- crtc_state = state->crtc->state;
-
addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
width = state->src_w >> 16;
height = state->src_h >> 16;
--
2.28.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Paul Cercueil <paul@crapouillou.net>,
linux-next@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org>
Subject: [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert
Date: Mon, 12 Oct 2020 12:25:09 +0200 [thread overview]
Message-ID: <20201012102509.10690-1-paul@crapouillou.net> (raw)
In-Reply-To: <20201012152452.432c4867@canb.auug.org.au>
Fix a badly reverted commit. The revert commit was cherry-picked from
drm-misc-next to drm-misc-next-fixes, and in the process some unrelated
code was added.
Fixes: a3fb64c00d44 "Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached""
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index 1be1235bd546..a3d1617d7c67 100644
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
}
}
-static void ingenic_drm_update_palette(struct ingenic_drm *priv,
- const struct drm_color_lut *lut)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
- u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
- | drm_color_lut_extract(lut[i].green, 6) << 5
- | drm_color_lut_extract(lut[i].blue, 5);
-
- priv->dma_hwdescs->palette[i] = color;
- }
-}
-
static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *oldstate)
{
@@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
dma_addr_t addr;
if (state && state->fb) {
- crtc_state = state->crtc->state;
-
addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
width = state->src_w >> 16;
height = state->src_h >> 16;
--
2.28.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-10-12 10:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 3:09 linux-next: build failure after merge of the drm-misc tree Stephen Rothwell
2020-10-08 3:09 ` [Intel-gfx] " Stephen Rothwell
2020-10-08 3:09 ` Stephen Rothwell
2020-10-08 4:42 ` Stephen Rothwell
2020-10-08 4:42 ` [Intel-gfx] " Stephen Rothwell
2020-10-08 4:42 ` Stephen Rothwell
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:24 ` [Intel-gfx] " Stephen Rothwell
2020-10-12 4:24 ` Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 4:26 ` [Intel-gfx] " Stephen Rothwell
2020-10-12 4:26 ` Stephen Rothwell
2020-10-12 10:15 ` Paul Cercueil
2020-10-12 10:15 ` [Intel-gfx] " Paul Cercueil
2020-10-12 10:15 ` Paul Cercueil
2020-10-12 10:25 ` Paul Cercueil [this message]
2020-10-12 10:25 ` [Intel-gfx] [PATCH] drm/ingenic: Fix bad revert Paul Cercueil
2020-10-12 10:25 ` Paul Cercueil
2020-10-12 14:10 ` Daniel Vetter
2020-10-12 14:10 ` [Intel-gfx] " Daniel Vetter
2020-10-12 14:10 ` Daniel Vetter
2020-10-12 19:13 ` Paul Cercueil
2020-10-12 19:13 ` [Intel-gfx] " Paul Cercueil
2020-10-12 19:13 ` Paul Cercueil
2020-10-12 18:10 ` [Intel-gfx] ✓ Fi.CI.BAT: success for " Patchwork
2020-10-12 21:34 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2020-10-13 11:12 ` linux-next: build failure after merge of the drm-misc tree Paul Cercueil
2020-10-13 11:12 ` [Intel-gfx] " Paul Cercueil
2020-10-13 11:12 ` Paul Cercueil
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=20201012102509.10690-1-paul@crapouillou.net \
--to=paul@crapouillou.net \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.