Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2278861ybl; Thu, 19 Dec 2019 10:55:11 -0800 (PST) X-Google-Smtp-Source: APXvYqx6Z0c+Y1ISgVDNf26jp4udFcpg3fCp+wfGxG9VEfdXZfopEUg4JuZI/evWfbSS06MBhpRV X-Received: by 2002:a05:6830:68b:: with SMTP id q11mr10570306otr.81.1576781711451; Thu, 19 Dec 2019 10:55:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576781711; cv=none; d=google.com; s=arc-20160816; b=IAULOwLv/cEJeU4XSIVpXjxaJBJdA/m9eh6MXuhTaETdCsgtVYGZg/9TQLl6JyHTyc MPr92T7F/aSNDf2aHj6/FmVIivs7BPLgQ0SkHrduvWF8d+kX0hbDISHPW+2yMpXngu/7 2Bu8v3LTFLX1gF+tTEqEvk7UIvjmjU86NNvaSgYqdbJQxcyrzpPGny0e+6E/7KrXR9pO i6W6rmH5qJUQNv688H9ITcYIjRywJc/nF+umAqRvVW8AZknp4pO02jYlNuWIIgzLGCIV S/QEE5YijtJ6sEX6mjIC5ZGDr16UwYlRqMMzTRBBBHjyEsnewEV8hawAiZ8b+Hva84ix Cagw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NWXiepHluWp+sebB6nA2SQetDyePKGVxdUC/+SnNvj0=; b=QWiyCzFUMeiTWvBcEfrGOPL4hz4bXS1E7HQSjLhzWishCgHwanKgqBYOM4lzRDfP3n Yaci+hcNGUzG0z9h7fZACP6YUtH7LMp1f6w9Dn38Z32qS8U8zVcUEhQdZ+f0eNI//TjR t4iWl2lK/DNK/eJo1bWx0zsjUxoUyVOFeGhQd0A32c5u8TZUYOalBHWskgJFyrTIx4/m JUzThPR4qBu49Ee1o4Kg6J3/w+3/+mVCRw8mCsrsnQJgSGGy+2jyDG7R+T9n+6jK3aX+ 17OZ51Gp4iMo9g5RHS50TtxDFDhKfg4kY/I1S1Rw1o/aCtqhK5zWbR7rqoBOa+S7uyue Cv2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KVwWfwm3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f22si1303835otp.178.2019.12.19.10.55.00; Thu, 19 Dec 2019 10:55:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KVwWfwm3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730328AbfLSSxI (ORCPT + 99 others); Thu, 19 Dec 2019 13:53:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:47972 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730323AbfLSSxG (ORCPT ); Thu, 19 Dec 2019 13:53:06 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A27B24683; Thu, 19 Dec 2019 18:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576781586; bh=DZTffMPfrJQtkLV5eRy2s0drgVzLds0tyJMKlwS9wv4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KVwWfwm3jEeKVK7oA76PmqhT+t9xjoXtraVgxGbrppcLjm4tEPxqKK4XthSJjQZCT XINCB/G8AIerE9sj9fIfNR84t6KhjTwh2kHhidPQF6SLXlVjCK3wXky4ALP/huHIoo 3XcThgjTo3zYPwPt1DjATzZ5260njh2aArIzoj7Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Meelis Roos , =?UTF-8?q?Michel=20D=C3=A4nzer?= , Alex Deucher Subject: [PATCH 4.19 46/47] drm/radeon: fix r1xx/r2xx register checker for POT textures Date: Thu, 19 Dec 2019 19:35:00 +0100 Message-Id: <20191219182956.768522615@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219182857.659088743@linuxfoundation.org> References: <20191219182857.659088743@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alex Deucher commit 008037d4d972c9c47b273e40e52ae34f9d9e33e7 upstream. Shift and mask were reversed. Noticed by chance. Tested-by: Meelis Roos Reviewed-by: Michel Dänzer Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/radeon/r100.c | 4 ++-- drivers/gpu/drm/radeon/r200.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -1820,8 +1820,8 @@ static int r100_packet0_check(struct rad track->textures[i].use_pitch = 1; } else { track->textures[i].use_pitch = 0; - track->textures[i].width = 1 << ((idx_value >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK); - track->textures[i].height = 1 << ((idx_value >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK); + track->textures[i].width = 1 << ((idx_value & RADEON_TXFORMAT_WIDTH_MASK) >> RADEON_TXFORMAT_WIDTH_SHIFT); + track->textures[i].height = 1 << ((idx_value & RADEON_TXFORMAT_HEIGHT_MASK) >> RADEON_TXFORMAT_HEIGHT_SHIFT); } if (idx_value & RADEON_TXFORMAT_CUBIC_MAP_ENABLE) track->textures[i].tex_coord_type = 2; --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c @@ -476,8 +476,8 @@ int r200_packet0_check(struct radeon_cs_ track->textures[i].use_pitch = 1; } else { track->textures[i].use_pitch = 0; - track->textures[i].width = 1 << ((idx_value >> RADEON_TXFORMAT_WIDTH_SHIFT) & RADEON_TXFORMAT_WIDTH_MASK); - track->textures[i].height = 1 << ((idx_value >> RADEON_TXFORMAT_HEIGHT_SHIFT) & RADEON_TXFORMAT_HEIGHT_MASK); + track->textures[i].width = 1 << ((idx_value & RADEON_TXFORMAT_WIDTH_MASK) >> RADEON_TXFORMAT_WIDTH_SHIFT); + track->textures[i].height = 1 << ((idx_value & RADEON_TXFORMAT_HEIGHT_MASK) >> RADEON_TXFORMAT_HEIGHT_SHIFT); } if (idx_value & R200_TXFORMAT_LOOKUP_DISABLE) track->textures[i].lookup_disable = true;