From patchwork Thu Jul 15 08:32:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 12379405 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=-18.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS 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 25DD3C07E96 for ; Thu, 15 Jul 2021 08:32:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9EC66120A for ; Thu, 15 Jul 2021 08:32:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9EC66120A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C71AC6E59F; Thu, 15 Jul 2021 08:32:36 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by gabe.freedesktop.org (Postfix) with ESMTPS id 682186E593; Thu, 15 Jul 2021 08:32:35 +0000 (UTC) Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 1DAEB1FDE5; Thu, 15 Jul 2021 08:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1626337954; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPRZqYFFDXsr1nfWshGUSVxlMQPbMs7W/lQIgkkruFA=; b=gexQKfyPGFYFbjrIf14YaOxc+fcjNjmRcgMsq0YFakTauMlMsSCRx8mn8F8L7uEBA1DiLf 2Za5dGxGZeVne/EGB4ECWFuqNHydxS9Spv8D3a6fe3S6yIADZ3X8/ma5BBeoXaobx0IDc2 WK6ZzkVDdMSP0EqnyTbtLjTrfmbDX8E= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1626337954; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cPRZqYFFDXsr1nfWshGUSVxlMQPbMs7W/lQIgkkruFA=; b=TMiv4VBrwOFXpwUGUWNFRaHL7yti39ygzdgRQem82DGB3G5XYNDUJk1izlYVyCTKKUtAmb V71iTq0FHe7aiqDQ== Received: from imap1.suse-dmz.suse.de (imap1.suse-dmz.suse.de [192.168.254.73]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap1.suse-dmz.suse.de (Postfix) with ESMTPS id D4B1513AB1; Thu, 15 Jul 2021 08:32:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap1.suse-dmz.suse.de with ESMTPSA id TVcIMqHy72DocQAAGKfGzw (envelope-from ); Thu, 15 Jul 2021 08:32:33 +0000 Date: Thu, 15 Jul 2021 10:32:32 +0200 From: Thomas Zimmermann To: Dave Airlie , Daniel Vetter Subject: [PULL] drm-misc-fixes Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dim-tools@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi , Sean Paul , intel-gfx@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Dave and Daniel, here's the PR for drm-misc-fixes. I merged drm-misc-next-fixes into it to pick up patches that were left over from the previous release cycle. The vmwgfx change comes from that. The other patches fix current errors. Best regards Thomas drm-misc-fixes-2021-07-15: Short summary of fixes pull (less than what git shortlog provides): * fbdev: Avoid use-after-free by not deleting current video mode * ttm: Avoid NULL-ptr deref in ttm_range_man_fini() * vmwgfx: Fix a merge commit The following changes since commit 1e7b5812f4890ad84058bbb6c4a5deddfb2c5b25: Merge tag 'drm-misc-fixes-2021-07-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2021-07-13 15:15:17 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2021-07-15 for you to fetch changes up to 9e5c772954406829e928dbe59891d08938ead04b: drm/ttm: add a check against null pointer dereference (2021-07-14 17:16:16 +0200) ---------------------------------------------------------------- Short summary of fixes pull (less than what git shortlog provides): * fbdev: Avoid use-after-free by not deleting current video mode * ttm: Avoid NULL-ptr deref in ttm_range_man_fini() * vmwgfx: Fix a merge commit ---------------------------------------------------------------- Christian König (1): drm/qxl: add NULL check for bo->resource Thomas Zimmermann (1): Merge remote-tracking branch 'drm-misc/drm-misc-next-fixes' into drm-misc-fixes Zack Rusin (2): drm/vmwgfx: Fix implicit declaration error drm/vmwgfx: Fix a bad merge in otable batch takedown Zhen Lei (1): fbmem: Do not delete the mode that is still in use Zheyu Ma (1): drm/ttm: add a check against null pointer dereference drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_range_manager.c | 3 +++ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 1 - drivers/video/fbdev/core/fbmem.c | 12 +++++------- 5 files changed, 10 insertions(+), 9 deletions(-) --- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer