From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 990B8C433FF for ; Mon, 29 Jul 2019 20:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DFB0205F4 for ; Mon, 29 Jul 2019 20:04:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564430648; bh=ZY24zMzUl487W9Xmc++d2mlHBn6l28pMRDTmBKYGDcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yOTNswuyIMV/3yZ1jl0N0L5f6NaQ6xlUfANQ8IW+/phJ6kg8qyTstmrsjKy9QwOjy 74Flmc+NMzqPw8I8sx+WRh04CQheEb/b4HlGXbszudrVEnnAtC06y18b086oHl97JD xbARB31vaS7mrFIRgmrY2K8Ho0EqbEPhQlTWGMWM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730007AbfG2UEH (ORCPT ); Mon, 29 Jul 2019 16:04:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:34916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390032AbfG2Tpx (ORCPT ); Mon, 29 Jul 2019 15:45:53 -0400 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 E2AE12171F; Mon, 29 Jul 2019 19:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564429552; bh=ZY24zMzUl487W9Xmc++d2mlHBn6l28pMRDTmBKYGDcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kYTDqltIi04W86xvV6nXTkqTrJqgj/a/7Fk4rKXOwcISil7WlehuDbb7lHIVruReh TRiC6ekB0bmsGHq9KxrFlmOVb24MYwJkfeoI2msv3ZGOU/9NR8SIbI5LZOGrcSPwu4 2DCBGdmATRJjeJ9Wv31f3W+/l8dLPc4gcaCS2lRY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Kazlauskas , Roman Li , Bhawanpreet Lakha , Alex Deucher , Sasha Levin Subject: [PATCH 5.2 020/215] drm/amd/display: Fill prescale_params->scale for RGB565 Date: Mon, 29 Jul 2019 21:20:16 +0200 Message-Id: <20190729190743.225595152@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190739.971253303@linuxfoundation.org> References: <20190729190739.971253303@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 [ Upstream commit 1352c779cb74d427f4150cbe779a2f7886f70cae ] [Why] An assertion is thrown when using SURFACE_PIXEL_FORMAT_GRPH_RGB565 formats on DCE since the prescale_params->scale wasn't being filled. Found by a dmesg-fail when running the igt@kms_plane@pixel-format-pipe-a-planes test on Baffin. [How] Fill in the scale parameter. Signed-off-by: Nicholas Kazlauskas Reviewed-by: Roman Li Acked-by: Bhawanpreet Lakha Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 7ac50ab1b762..7d7e93c87c28 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -242,6 +242,9 @@ static void build_prescale_params(struct ipp_prescale_params *prescale_params, prescale_params->mode = IPP_PRESCALE_MODE_FIXED_UNSIGNED; switch (plane_state->format) { + case SURFACE_PIXEL_FORMAT_GRPH_RGB565: + prescale_params->scale = 0x2082; + break; case SURFACE_PIXEL_FORMAT_GRPH_ARGB8888: case SURFACE_PIXEL_FORMAT_GRPH_ABGR8888: prescale_params->scale = 0x2020; -- 2.20.1