Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751908AbdFOJXj (ORCPT ); Thu, 15 Jun 2017 05:23:39 -0400 Received: from mail.lysator.liu.se ([130.236.254.3]:40618 "EHLO mail.lysator.liu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777AbdFOJXi (ORCPT ); Thu, 15 Jun 2017 05:23:38 -0400 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Boris Brezillon , David Airlie , dri-devel@lists.freedesktop.org Subject: [PATCH] drm: atmel-hlcdc: sama5d4 does not have overlay2 Date: Thu, 15 Jun 2017 11:24:13 +0200 Message-Id: <1497518653-2788-1-git-send-email-peda@lysator.liu.se> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1236 Lines: 46 From: Peter Rosin Remove the layer. Fixes: 5b9fb5e6c6c7 ("drm: atmel-hlcdc: add support for sama5d4 SoCs") Signed-off-by: Peter Rosin --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 30dbffd..888524a 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -295,28 +295,10 @@ static const struct atmel_hlcdc_layer_desc atmel_hlcdc_sama5d4_layers[] = { }, }, { - .name = "overlay2", - .formats = &atmel_hlcdc_plane_rgb_formats, - .regs_offset = 0x240, - .id = 2, - .type = ATMEL_HLCDC_OVERLAY_LAYER, - .cfgs_offset = 0x2c, - .layout = { - .pos = 2, - .size = 3, - .xstride = { 4 }, - .pstride = { 5 }, - .default_color = 6, - .chroma_key = 7, - .chroma_key_mask = 8, - .general_config = 9, - }, - }, - { .name = "high-end-overlay", .formats = &atmel_hlcdc_plane_rgb_and_yuv_formats, .regs_offset = 0x340, - .id = 3, + .id = 2, .type = ATMEL_HLCDC_OVERLAY_LAYER, .cfgs_offset = 0x4c, .layout = { -- 2.1.4