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 X-Patchwork-Id: 9990493 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8E2736020F for ; Fri, 6 Oct 2017 21:46:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7BCA528E17 for ; Fri, 6 Oct 2017 21:46:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E2F528E21; Fri, 6 Oct 2017 21:46:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0EF3328E17 for ; Fri, 6 Oct 2017 21:46:55 +0000 (UTC) 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" X-Virus-Scanned: ClamAV using ClamSMTP 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();