From patchwork Fri Oct 6 21:46:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 115137 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp12219qgn; Fri, 6 Oct 2017 14:46:55 -0700 (PDT) X-Received: by 10.101.72.65 with SMTP id i1mr1160639pgs.301.1507326415418; Fri, 06 Oct 2017 14:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507326415; cv=none; d=google.com; s=arc-20160816; b=D4pCFmFtQt+cLp1E4PAJJIP94XfCPf8GizATgeN8TmfndOXUA3DwEdGrFFePccrf6s PqF+Z6maNxEpftXQHj57M6QNK+HlH7OyrBr/VL3D7/1BTPo/8Zx4ZP7eGCKGwRfzTkrh tGa/PVN0zQVBsTBAzFuwNCA1SwiIApetrUIZ78K2ssCANZncjotsapue8UqK7P6vr8DI EtQXOSzwZ3XYAKMRFm+2PtgnysbkBRGNDjHU7AoaXzJvieVZ+niLFEx70DmciFX2+bqd 2pqgELx8C3rXk/AeHu1AQsmW7IWulApxB5DTsrlDKN5diAU3jrLrhpZjhyHYnwsvM8JQ JpVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:cc:message-id:date:subject:to:from:delivered-to :arc-authentication-results; bh=781jB4H6Vpsx4q5TiAVBg5wp3rZzQ+FzwYZjlaSn1Pg=; b=QsyI9SkCqTaYTFUbMYndca5DZ8goX8E97Uui5ujEypF8HMJH6ryI2rgzJku+Eey1UP xXL+mnuPSNE4wrP6aEU0zxngNqG4cUmcZyfMb+g25J/DEh+/2sga3lScH37qmlajzSAn wLu+ci0ppEOimBxJNrUsC/08nX65wksOjnYHy8uYaKsH7qLhBrpOZdi6MMWNnPw1/M1Y Ou1IlLhUdE3RnIDDaBjI14O1yFWOzbYZkvapLa6GeCf8ZUbuJ8IBiMRgRiB8uE92zF2e 7VcFhxC2mnUULYIMZB3IS94Rpa1yA6sAkDK22ekhI+Mt3TVlRxE1q5fNNCsyYdUKtn1P Wsbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id 36si1955617ple.401.2017.10.06.14.46.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2017 14:46:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) 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 6C4746E9A4; Fri, 6 Oct 2017 21:46:53 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-oi0-f68.google.com (mail-oi0-f68.google.com [209.85.218.68]) by gabe.freedesktop.org (Postfix) with ESMTPS id 61B626E9A4 for ; Fri, 6 Oct 2017 21:46:52 +0000 (UTC) Received: by mail-oi0-f68.google.com with SMTP id h9so10771724oia.4 for ; Fri, 06 Oct 2017 14:46:52 -0700 (PDT) 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; bh=q7xL+Ulbg2RauGUWQRk2fi5rsRwbqzAfA76+oPsrNZU=; b=i0H0/EowP656HPK6O/ldcuwvos7RMOotRMfpRlVyZWCk1+sJERbR2cftZe8yQ20jIc 7AwFsUMIA57N60d8lqxR8IGUA0MaiBlbMP6aEH2YnUJDM0cizZN/ztpOESIRyYozQdp/ ORMPFIK6DmNruTexyQrcUjdr3o4TwymyEQbSohW5XSeSJiT0CK7HQTPBXFH4WJRzS+kS Oe4Dovx0EucZu/VZh3EtZFWwfG/qTUGKTOLM1WwAZ9o6kibsgH9NiT6dx1C9LZjbSU/e bbXBty8lC6mSDnU4He/Lwx3+7y7xvCUc8qpOYsS6jlUpER+tqkFDaOU9ssnK2x4zOmN+ wGMw== X-Gm-Message-State: AMCzsaVkgAM59jkCNg2FxVjhxfFqH5EsVkD7wBnVlhIfrvN8q2l+MR7U wnSPe072Ko8nBBPjXgVns5x3wnA= X-Google-Smtp-Source: AOwi7QBdaDSAFHqI+9E5acwCwUj0z5MrPBRdUR8rsiVM31f+3ijMzmOh5/FxVNpPfFBtlhezOZBjOA== X-Received: by 10.157.63.54 with SMTP id m51mr2314138otc.78.1507326411313; Fri, 06 Oct 2017 14:46:51 -0700 (PDT) Received: from localhost.localdomain (216-188-254-6.dyn.grandenetworks.net. [216.188.254.6]) by smtp.googlemail.com with ESMTPSA id i9sm1275920oth.56.2017.10.06.14.46.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2017 14:46:50 -0700 (PDT) From: Rob Herring To: dri-devel@lists.freedesktop.org Subject: [PATCH hwc] drm_hwcomposer: use upstream DRM_MODE_{ROTATE, REFLECT} defines Date: Fri, 6 Oct 2017 16:46:48 -0500 Message-Id: <20171006214648.2077-1-robh@kernel.org> X-Mailer: git-send-email 2.11.0 Cc: Robert Foss X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The DRM_REFLECT_* and DRM_ROTATE_* defines were not upstream, but now they are. Convert to using the upstream version which are defined as a bit mask rather than a bit position. Signed-off-by: Rob Herring Reviewed-by: Thierry Reding --- drmdisplaycompositor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drmdisplaycompositor.cpp b/drmdisplaycompositor.cpp index a07d3588d1f5..036a45e8b88b 100644 --- a/drmdisplaycompositor.cpp +++ b/drmdisplaycompositor.cpp @@ -572,15 +572,15 @@ int DrmDisplayCompositor::CommitFrame(DrmDisplayComposition *display_comp, rotation = 0; if (layer.transform & DrmHwcTransform::kFlipH) - rotation |= 1 << DRM_REFLECT_X; + rotation |= DRM_MODE_REFLECT_X; if (layer.transform & DrmHwcTransform::kFlipV) - rotation |= 1 << DRM_REFLECT_Y; + rotation |= DRM_MODE_REFLECT_Y; if (layer.transform & DrmHwcTransform::kRotate90) - rotation |= 1 << DRM_ROTATE_90; + rotation |= DRM_MODE_ROTATE_90; else if (layer.transform & DrmHwcTransform::kRotate180) - rotation |= 1 << DRM_ROTATE_180; + rotation |= DRM_MODE_ROTATE_180; else if (layer.transform & DrmHwcTransform::kRotate270) - rotation |= 1 << DRM_ROTATE_270; + rotation |= DRM_MODE_ROTATE_270; if (fence_fd < 0) { int prop_id = plane->in_fence_fd_property().id();