Skip to content

Commit d3c8f27

Browse files
committed
drm/ingenic: Fix bad revert
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: a3fb64c ("Revert "gpu/drm: ingenic: Add option to mmap GEM buffers cached"") Signed-off-by: Paul Cercueil <[email protected]> Acked-by: Daniel Vetter <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent c2df75a commit d3c8f27

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

drivers/gpu/drm/ingenic/ingenic-drm-drv.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -440,20 +440,6 @@ void ingenic_drm_plane_config(struct device *dev,
440440
}
441441
}
442442

443-
static void ingenic_drm_update_palette(struct ingenic_drm *priv,
444-
const struct drm_color_lut *lut)
445-
{
446-
unsigned int i;
447-
448-
for (i = 0; i < ARRAY_SIZE(priv->dma_hwdescs->palette); i++) {
449-
u16 color = drm_color_lut_extract(lut[i].red, 5) << 11
450-
| drm_color_lut_extract(lut[i].green, 6) << 5
451-
| drm_color_lut_extract(lut[i].blue, 5);
452-
453-
priv->dma_hwdescs->palette[i] = color;
454-
}
455-
}
456-
457443
static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
458444
struct drm_plane_state *oldstate)
459445
{
@@ -464,8 +450,6 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane,
464450
dma_addr_t addr;
465451

466452
if (state && state->fb) {
467-
crtc_state = state->crtc->state;
468-
469453
addr = drm_fb_cma_get_gem_addr(state->fb, state, 0);
470454
width = state->src_w >> 16;
471455
height = state->src_h >> 16;

0 commit comments

Comments
 (0)