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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4EE37C433DF for ; Tue, 23 Jun 2020 21:25:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AFA920738 for ; Tue, 23 Jun 2020 21:25:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947548; bh=ZpNXU+lOBK99/weNKs9dBLEjsm8HvJhyAZAbey3M6VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mu/kd+vPDWhavj0NOkqwxSIYdsc8Otg5Dtginc1TbNDvuE5mj7FMnNGEhoHmN9TUT UzKVwgIjivlJ9XTqVKUyi7ZEyjYwCjkAW8Ki7IhCTn2FcA6VMO5+nC7GusjneqJojE aDU8NXlMN/Ux/JYTz+jQdIw/qFkY/enZc/XaAgiQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389220AbgFWVZq (ORCPT ); Tue, 23 Jun 2020 17:25:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389667AbgFWUSi (ORCPT ); Tue, 23 Jun 2020 16:18:38 -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 3C5872080C; Tue, 23 Jun 2020 20:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943518; bh=ZpNXU+lOBK99/weNKs9dBLEjsm8HvJhyAZAbey3M6VQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pKbc5fGM2HhmIVuncOmfTUOPa94+VCOfFTvP+WA/Ltsqd/+KlwXJFD2WBhQIrQ3Ua iY9mIjwJAUs5o7dkWoWfDyZ5taG5Yj+upzEVN9b2ZwNh1raRPS67AqGsYIV+3g+r8L rlAUfYAizfUB30BqS0XoryOpcOH8WBdA5BCe4iP0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huacai Chen , Gerd Hoffmann Subject: [PATCH 5.7 423/477] drm/qxl: Use correct notify port address when creating cursor ring Date: Tue, 23 Jun 2020 21:57:00 +0200 Message-Id: <20200623195427.523985012@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Huacai Chen commit 80e5f89da3ab949fbbf1cae01dfaea29f5483a75 upstream. The command ring and cursor ring use different notify port addresses definition: QXL_IO_NOTIFY_CMD and QXL_IO_NOTIFY_CURSOR. However, in qxl_device_init() we use QXL_IO_NOTIFY_CMD to create both command ring and cursor ring. This doesn't cause any problems now, because QEMU's behaviors on QXL_IO_NOTIFY_CMD and QXL_IO_NOTIFY_CURSOR are the same. However, QEMU's behavior may be change in future, so let's fix it. P.S.: In the X.org QXL driver, the notify port address of cursor ring is correct. Signed-off-by: Huacai Chen Cc: Link: http://patchwork.freedesktop.org/patch/msgid/1585635488-17507-1-git-send-email-chenhc@lemote.com Signed-off-by: Gerd Hoffmann Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/qxl/qxl_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -218,7 +218,7 @@ int qxl_device_init(struct qxl_device *q &(qdev->ram_header->cursor_ring_hdr), sizeof(struct qxl_command), QXL_CURSOR_RING_SIZE, - qdev->io_base + QXL_IO_NOTIFY_CMD, + qdev->io_base + QXL_IO_NOTIFY_CURSOR, false, &qdev->cursor_event);