Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp2296878ybl; Thu, 19 Dec 2019 11:10:37 -0800 (PST) X-Google-Smtp-Source: APXvYqyxjawC+tQSJKdZL07EM1gqTUuk2rpygNSbI2Uej54+NuVfJ4mDUy8iUWkG1kO4GNrLQA+D X-Received: by 2002:a9d:6211:: with SMTP id g17mr7958018otj.168.1576782637227; Thu, 19 Dec 2019 11:10:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576782637; cv=none; d=google.com; s=arc-20160816; b=EoSM+KElUZiUx8ukh5NzoXH5HD+kBUVonbExAteBGaYZiM9a/hIMxqzhp0wviaRxGz No1Rn/7AFtgTLsfJ6VQ5MM1n12F5nkwRyx8NZaVZumsXL1g8RVlYpy8cWreOHPnAClCT nDHD/kVy6W0QQ/jiUgo88v8nnlWGZc8xUi7DuNO4vkUk72UTp+yHWrkzVtSNHZSjCyAW 0/4EgyOVMcNz3xQe52PL5bf9VS2GMbpruGr6WQ2+y0FFVeyG5ZiLj7iaf5QKljUSX6El DMX96P0avVBHtTkI3kZkJbjnMzdoY/AjErR6Xe3CTR6RT5YATMu+JeLQ9NQdJVBleYXd jmcQ== 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=yfgmm/c1U9t4lUy+iJVVZPMya1giCQklYMi7xzd4RBo=; b=x9QJZJkVf7aMnact10mtKkgqI9eP3rc+/goz+qL2CVG3KVnpK+6GllDcLavAO5RtWY XLJyFQmVkMAocstgZr7EJm2GY3UiJQQ65HctmGOonqBLwKdlaOHgRe4JolXCWNkyFmK8 fTD6BD++c3Li0noefeKpNxI/peEj1P6PQzmoDz98ZcMOldFxeOsmEIM7Ub/Kk6/A/7I0 lzRCCWm97+qo9dPmDCPBaCH4AbDtnFuMNq0/ZyjtQvxo/KS2UwDE+BHmsKE4OhA1gdBt BZYTbpICsH7ioR9EeztMtgzPaNKMZl+qZKRs+f7kaQ3E0Pt3uWcie4cfOIa4vVvQ1wk6 E2xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=xFv52IgM; 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 n1si3192668oic.225.2019.12.19.11.10.24; Thu, 19 Dec 2019 11:10:37 -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=xFv52IgM; 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 S1728609AbfLSTI1 (ORCPT + 99 others); Thu, 19 Dec 2019 14:08:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:32844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728183AbfLSSlw (ORCPT ); Thu, 19 Dec 2019 13:41:52 -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 8651A206D7; Thu, 19 Dec 2019 18:41:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780912; bh=F/DzLy0Md+yRJaxTa2YpI3P8cDeNkEsaZq3s1CPzwF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xFv52IgMuSFBp0xaY5z64V8wSgzCN2uigvSs3lizLqOUpXZwnN5jB8xsWMAULHCQi AC4METz4Mxumt35WjXJJu92jH1GBhKDy2RALi0qGaWTtJ+kksFWAlXxGMvF05Rvtm8 t4EYyfeOR16Fwb8OyUBv6YHm2+g54JSuAe2/NTA4= 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.4 159/162] drm/radeon: fix r1xx/r2xx register checker for POT textures Date: Thu, 19 Dec 2019 19:34:27 +0100 Message-Id: <20191219183217.451198500@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@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 @@ -1826,8 +1826,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;