From patchwork Thu Jul 23 09:05:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11680473 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01D0213B1 for ; Thu, 23 Jul 2020 09:05:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D2FC020656 for ; Thu, 23 Jul 2020 09:05:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="Dh+hv/l6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D2FC020656 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C91628980C; Thu, 23 Jul 2020 09:05:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id D043C8980C for ; Thu, 23 Jul 2020 09:05:56 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id f18so4476529wml.3 for ; Thu, 23 Jul 2020 02:05:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4YwVwYWTqndxCbsk2H38cWSsg3v3dA5HnwhfyPRdygY=; b=Dh+hv/l6NQ3KPAUwJ3pGLveCtOWhIrkufkmB1J+B6iIB43BdLXWcJxxEw2kn1aV+// 2JduwiOcZylMNxNHMcbMG9ZbOIEHlqKi3fhxPOpIxh10qbgq5XYcYr81SyFIWCdzFHd4 15yPWQewJKf/16Bt+3N4M4eDj6wXOH2/RBv+0qs8XhfvzmcTQR74kceTWo/9YQOhHdlF O7P8bR3q3iUqAML7xw5WsywjG3nrGqFPLPvCJ/RvXDzoddRmu6iIgmgrJk3xL3Lx9OL+ 3Vynunr/OK7U/oZLr+jaCT+zxs/+6mBxrJajTs7hC+4/Ls4HRMdvH9wOOkaPBsOIxr6a LgUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=4YwVwYWTqndxCbsk2H38cWSsg3v3dA5HnwhfyPRdygY=; b=dp1kZGVXkoIHOoNjmgWT5/pJTeRXs9YhcCtBTWuywT0OMrc3cfvFoj2NuOwiyLepxY 7nr1yW5hbr33LSGwkqkBRsLkepOmZltmDjk/zu1n/a9nepzIpAyurvg/0HH99Jal7SQa gUlE3uUXs/2byMgKgjuQk40ZCoICm12gMi/ZkIjPx3moNg1VO++AMJbzf8kn5Vb+blgB TA9VuzBLoVjGm5wfiUfRevEvXVKjK7OgXgk/jdITWDpNRDT4HLQUTXLUbvxTp7miyeWR oOAmEhSQwJO46MCwkNYDu2OLvCJqLuUwWKLbXC4ff/typlLGkJQR6kfpuO2tV7aaWNfu iXCw== X-Gm-Message-State: AOAM532STRKBDfB2nGFejHP1hXulBFmKhTYikTVkdBDOPPPSGiYZVprb EICkJx58CnjhcBhUeffZyyty8w== X-Google-Smtp-Source: ABdhPJzM4ikkmRW1tN1fO+N5OIpr1/NNankXN3WMB2rYpcK0NBtOI2uo45JomMLql69t8i0N0TZePQ== X-Received: by 2002:a1c:4c16:: with SMTP id z22mr3176646wmf.103.1595495155216; Thu, 23 Jul 2020 02:05:55 -0700 (PDT) Received: from bender.baylibre.local ([2a01:e35:2ec0:82b0:5ce9:901f:7444:d44d]) by smtp.gmail.com with ESMTPSA id 62sm2947397wrq.31.2020.07.23.02.05.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 02:05:54 -0700 (PDT) From: Neil Armstrong To: daniel@ffwll.ch Subject: [PATCH 1/2] drm/fourcc: fix Amlogic Video Framebuffer Compression macro Date: Thu, 23 Jul 2020 11:05:50 +0200 Message-Id: <20200723090551.27529-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: khilman@baylibre.com, Neil Armstrong , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix the Amlogic Video Framebuffer Compression modifier macro to correctly add the layout options, a pair of parenthesis was missing. Fixes: d6528ec88309 ("drm/fourcc: Add modifier definitions for describing Amlogic Video Framebuffer Compression") Signed-off-by: Neil Armstrong Acked-by: Sam Ravnborg --- include/uapi/drm/drm_fourcc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 4bee7de5f306..82f327801267 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -1004,7 +1004,7 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) #define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \ fourcc_mod_code(AMLOGIC, \ ((__layout) & __fourcc_mod_amlogic_layout_mask) | \ - ((__options) & __fourcc_mod_amlogic_options_mask \ + (((__options) & __fourcc_mod_amlogic_options_mask) \ << __fourcc_mod_amlogic_options_shift)) /* Amlogic FBC Layouts */ From patchwork Thu Jul 23 09:05:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11680475 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 437AB1709 for ; Thu, 23 Jul 2020 09:06:02 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21A0720714 for ; Thu, 23 Jul 2020 09:06:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="dp4NOUJq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21A0720714 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 088856E87C; Thu, 23 Jul 2020 09:06:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DF4C899BC for ; Thu, 23 Jul 2020 09:05:58 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id f18so4425040wrs.0 for ; Thu, 23 Jul 2020 02:05:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LreLnnZrmwYYHqpYhGckfxJZdjPdivebpamaHVtnHss=; b=dp4NOUJqQL/scm6GUYDjAXuLDt4cgSIbswqtZ6cIJfZCxfzC1NpMAwaIZ+2dvElcj9 SDC0T7IQ44exhyDpzJ9m7bbXA8SelqJO/TmmnZPQfFDK63km9fcYn7YvPWQPd4zttNZm DgWrxRl6zwWKV+SF2Dezay6uB7J+zAzzIPC7iRSeLSi9hP4VzjDj2CYgg7Y9mSk1PDhz A52xl0Ki7OzQ5at/zyyUJtmVloPz8Vqhq2ZgYD6xs3fo1wUAWRJNN6adh8xK05051VJA f8qrpe2alI3fnTVS4Nrfn641a/3JssxJhg5jEeT8FUwJs2HZAvWCnrUvgjhoOUId9/CY j47A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LreLnnZrmwYYHqpYhGckfxJZdjPdivebpamaHVtnHss=; b=US8ga6GajXh+YlBhuWLWnyJiqBkFDd5QkmRROfdggFxzJA3JK2fVf3FqH6iVYtyaLJ qeH6O8PWhntjI5ZuhgFZ0gLWnLuPtgl5oWlP3UMCk6Lt6vVy+rrqdUh3aPY2uxVk4wYV fKB4e3oGH8oLonml0Q73ifellV8X+dBWMjdeYga36F4KlcgCrYWn15jt3xWUXRtwxk56 hl1Ikc+ckbOrvm/mnsG3yCnhYunDnXUjgGGW8XQXzUOQd8jNGpQ1K4isZsLZyiz70/W5 mttyXP+v0u1ONMBBZLrObMUOV+vwIsS/NSHyFRj5AguxjBHg1AlWcAnDmMwrBr3oKrAq zHRQ== X-Gm-Message-State: AOAM532HTEN0XmV7LjMb+h7OdPKJV75ehAuo+BEt+d32db9sy9CTbkjp eOPmrMPnxzoIkO39OI55Ia0XUg== X-Google-Smtp-Source: ABdhPJzqffe9YMOSst9S78aI/iVWmungmYo/9CY48wTFHegSvIqIB1PAqtLGwVADRl5r9zYcZipJCA== X-Received: by 2002:adf:ec8b:: with SMTP id z11mr3032026wrn.51.1595495156669; Thu, 23 Jul 2020 02:05:56 -0700 (PDT) Received: from bender.baylibre.local ([2a01:e35:2ec0:82b0:5ce9:901f:7444:d44d]) by smtp.gmail.com with ESMTPSA id 62sm2947397wrq.31.2020.07.23.02.05.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 02:05:56 -0700 (PDT) From: Neil Armstrong To: daniel@ffwll.ch Subject: [PATCH 2/2] drm/meson: overlay: fix Amlogic Compressed Framebuffer modifier layout extract Date: Thu, 23 Jul 2020 11:05:51 +0200 Message-Id: <20200723090551.27529-2-narmstrong@baylibre.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20200723090551.27529-1-narmstrong@baylibre.com> References: <20200723090551.27529-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: khilman@baylibre.com, Neil Armstrong , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The bitwise operation worked because the result is casted in a lower bits integer, and was not changed after the modifier defines rework. Use the correct operation as already used in meson_overlay_atomic_update(). Fixes: e860785d5730 ("drm/meson: overlay: setup overlay for Amlogic FBC") Signed-off-by: Neil Armstrong --- drivers/gpu/drm/meson/meson_overlay.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_overlay.c b/drivers/gpu/drm/meson/meson_overlay.c index a8bcc70644df..83ec613bbfb6 100644 --- a/drivers/gpu/drm/meson/meson_overlay.c +++ b/drivers/gpu/drm/meson/meson_overlay.c @@ -756,8 +756,7 @@ static bool meson_overlay_format_mod_supported(struct drm_plane *plane, if ((modifier & DRM_FORMAT_MOD_AMLOGIC_FBC(0, 0)) == DRM_FORMAT_MOD_AMLOGIC_FBC(0, 0)) { unsigned int layout = modifier & - DRM_FORMAT_MOD_AMLOGIC_FBC( - __fourcc_mod_amlogic_layout_mask, 0); + __fourcc_mod_amlogic_layout_mask; unsigned int options = (modifier >> __fourcc_mod_amlogic_options_shift) & __fourcc_mod_amlogic_options_mask;