Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp1081780iog; Thu, 30 Jun 2022 16:52:03 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uHWXA2HHJZHAwSgTBkIg01hdIYNBOSehyZi0jVIZBYePGXhfoO07p0GNn9I2pNWINVw5jS X-Received: by 2002:a17:90b:1982:b0:1ec:988f:e133 with SMTP id mv2-20020a17090b198200b001ec988fe133mr15084227pjb.211.1656633123033; Thu, 30 Jun 2022 16:52:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656633123; cv=none; d=google.com; s=arc-20160816; b=zpIoXGn0ofPsyn//Gkn1f7+aNkJ7PlxU7Eoud8S11m2JveDSCL6y8DiKip5gJjz6RE ypV8VcKk/9zmVrQ58YthZaHm+SmzlnbaC3utLyZkbYi+f4430vVfrXLtCwPmbyx8ktO3 LBkn+Fx6vpReNZO3iHV7bNrwC4jTGjm7X3wvWp75fH+b8ns+K/TlWCk7vBw+uwdOYktr u5vO3wg4iUGOhaDp+4pIzQYJh9PE2pAHHz8Y1u1anGzgzzDYHsLCpgKodJvMitjuRT/1 CLeB4QmXfG42mke7+4fRPpRtk4FBdMkbvSBoyK3KFpSr3h8OByJ6tQS9FX011v+d1NWN Y4AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:mime-version :dkim-signature; bh=Si6Vg1wa/7RogX1AusbI0XgUV6cLT3cMbVhFnYF9DAM=; b=YQc3RyOvNIce2YmyjEVPomrIwVQFfaUe2MTDq2UieL3efcgYo4AgOHl3QYTc+mrcXA 6wEfkizUlrk7bxW6PU4x+j7zVGpkDAFK7GOgx9z5HQfz1T5vqNnNL/ilFc1rKKYhHn8q 3F2CEoM2lhQxcjFtCiXpVcK2zL49jVyWvyWcxH2+n/9/I2B3w3koYamTw8sbZdztSXwk ZeEyHI94y+K3v35bHKGgHvSU8J1gn3rzMF91+7NRY07QAtAZ+31Xkfhx8ZaDSSBTZVTX xnEOInlEi2NjEbjrAAhoSDcIb5WlqkEGOR4NK65g1mdTlDFUvUjkfbJqNgE+7kxhp5zR dV9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=f1gh8kvL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a11-20020a056a000c8b00b00517c9022a86si29660973pfv.199.2022.06.30.16.51.51; Thu, 30 Jun 2022 16:52:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=f1gh8kvL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232053AbiF3Xug (ORCPT + 99 others); Thu, 30 Jun 2022 19:50:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231470AbiF3Xu3 (ORCPT ); Thu, 30 Jun 2022 19:50:29 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 617B1366B9 for ; Thu, 30 Jun 2022 16:50:22 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id q6so961933eji.13 for ; Thu, 30 Jun 2022 16:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to:cc; bh=Si6Vg1wa/7RogX1AusbI0XgUV6cLT3cMbVhFnYF9DAM=; b=f1gh8kvL2CRI3T0JwQhmXBnHUIr6ajhEOmkd6OMB1ChlymB60XN/Exm5AeWTglJpax EHMl1965t/hUJ8/nr6gw8bXAL48vchXVqwChEpEFWe5ozXSkt8AePjJBMm/Qe6u6LNyr qJtY0KPJ9EeMlXOlN0kC/1gWq8OIuvB8bRkvcPsq1HmSbqX1Tga60Etj+a9sI/uaBlua kS6W4jTlgsr2xfjeU6U5kefF3fk8rFI+2NOE/pZTcMGJ+7jkORiphuXSjXSaEG8H/lRl dGhmO5BTJNKZtcnhvsLCVPDgo4zqJJqpINZm5tjQMxnNyJeVh7oLlQsJvW59j21cUmsq AvqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=Si6Vg1wa/7RogX1AusbI0XgUV6cLT3cMbVhFnYF9DAM=; b=5uR1/Hx5b9iNt5H/8Kp/arhgd3N4qeo5weBaK5Ky1y2RmT6ZyrNtALnOCtb2xOuglT z5yS3d4zZCuI3IncF6UQmHApzLCACI8nEC9tSuaGGugeiweyMUIe0NMDDGoGqIPo9mzS J4WuOBd+O1G32wyQrVvoVy05B83Xh7tb0MPNoETTnUHh4vFfEyh3OT9vidGDXTc4kqXj 4QECp6KfH2IU3hxfqIDm1XZBt6W1Sg2YS0ucM+v8OV+8bqapivQ2V4K0+lAxq/iaDgaj 5U/p8eTAcef0ni87F2eJZba8tlcDnH3vbA8KLf2+J7wDaQLrHfhjJPCGnZ3921PkBTcJ H0pA== X-Gm-Message-State: AJIora8l+nWEfeCZsfASIX8cRTJFgw7F1NoFc7V402KghWe2klvXnmEQ fEr9igY8AZ5lArBJG7CMakwh4pxzAJQOc+tP33NhfXtjdys= X-Received: by 2002:a17:906:149:b0:712:502:bc62 with SMTP id 9-20020a170906014900b007120502bc62mr11535312ejh.720.1656633020792; Thu, 30 Jun 2022 16:50:20 -0700 (PDT) MIME-Version: 1.0 From: Dave Airlie Date: Fri, 1 Jul 2022 09:50:09 +1000 Message-ID: Subject: [git pull] drm fixes for 5.19-rc5 To: Linus Torvalds , Daniel Vetter Cc: dri-devel , LKML Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Bit quieter this week, the main thing is it pulls in the fixes for the sysfb resource issue you were seeing. these had been queued for next so should have had some decent testing. Otherwise amdgpu, i915 and msm each have a few fixes, and vc4 has one. Just to reiterate, I'm out next week (and Daniel is as well), so I'd expect rc7 might have a bit more, I'll likely send whatever lands in the queue early the next week. Regards, Dave. drm-fixes-2022-07-01: drm fixes for 5.19-rc5 fbdev: - sysfb fixes/conflicting fb fixes. amdgpu: - GPU recovery fix - Fix integer type usage in fourcc header for AMD modifiers - KFD TLB flush fix for gfx9 APUs - Display fix i915: - Fix ioctl argument error return - Fix d3cold disable to allow PCI upstream bridge D3 transition - Fix setting cache_dirty for dma-buf objects on discrete msm: - Fix to increment vsync_cnt before calling drm_crtc_handle_vblank so that userspace sees the value *after* it is incremented if waiting for vblank events - Fix to reset drm_dev to NULL in dp_display_unbind to avoid a crash in probe/bind error paths - Fix to resolve the smatch error of de-referencing before NULL check in dpu_encoder_phys_wb.c - Fix error return to userspace if fence-id allocation fails in submit ioctl vc4: - NULL ptr dereference fix The following changes since commit 03c765b0e3b4cb5063276b086c76f7a612856a9a: Linux 5.19-rc4 (2022-06-26 14:22:10 -0700) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm tags/drm-fixes-2022-07-01 for you to fetch changes up to b8f0009bc9edf9186b20ae2a9e442ef0af93040e: Merge tag 'drm-misc-fixes-2022-06-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes (2022-07-01 09:27:55 +1000) ---------------------------------------------------------------- drm fixes for 5.19-rc5 fbdev: - sysfb fixes/conflicting fb fixes. amdgpu: - GPU recovery fix - Fix integer type usage in fourcc header for AMD modifiers - KFD TLB flush fix for gfx9 APUs - Display fix i915: - Fix ioctl argument error return - Fix d3cold disable to allow PCI upstream bridge D3 transition - Fix setting cache_dirty for dma-buf objects on discrete msm: - Fix to increment vsync_cnt before calling drm_crtc_handle_vblank so that userspace sees the value *after* it is incremented if waiting for vblank events - Fix to reset drm_dev to NULL in dp_display_unbind to avoid a crash in probe/bind error paths - Fix to resolve the smatch error of de-referencing before NULL check in dpu_encoder_phys_wb.c - Fix error return to userspace if fence-id allocation fails in submit ioctl vc4: - NULL ptr dereference fix ---------------------------------------------------------------- Alex Deucher (2): drm/amdgpu: fix adev variable used in amdgpu_device_gpu_recover() Revert "drm/amdgpu/display: set vblank_disable_immediate for DC" Anshuman Gupta (1): drm/i915/dgfx: Disable d3cold at gfx root port Carlos Llamas (1): drm/fourcc: fix integer type usage in uapi header Dave Airlie (4): Merge tag 'drm-msm-fixes-2022-06-28' of https://gitlab.freedesktop.org/drm/msm into drm-fixes Merge tag 'drm-intel-fixes-2022-06-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes Merge tag 'amd-drm-fixes-5.19-2022-06-29' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes Merge tag 'drm-misc-fixes-2022-06-30' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes Javier Martinez Canillas (3): firmware: sysfb: Make sysfb_create_simplefb() return a pdev pointer firmware: sysfb: Add sysfb_disable() helper function fbdev: Disable sysfb device registration when removing conflicting FBs Kuogee Hsieh (1): drm/msm/dp: reset drm_dev to NULL at dp_display_unbind() Matthew Auld (1): drm/i915: tweak the ordering in cpu_write_needs_clflush Maxime Ripard (1): drm/vc4: perfmon: Fix variable dereferenced before check Rob Clark (1): drm/msm/gem: Fix error return on fence id alloc fail Ruili Ji (1): drm/amdgpu: To flush tlb for MMHUB of RAVEN series Stephen Boyd (1): drm/msm/dpu: Increment vsync_cnt before waking up userspace katrinzhou (1): drm/i915/gem: add missing else sunliming (1): drm/msm/dpu: Fix variable dereferenced before check .../driver-api/firmware/other_interfaces.rst | 6 +++ drivers/firmware/sysfb.c | 58 +++++++++++++++++++--- drivers/firmware/sysfb_simplefb.c | 16 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 -- drivers/gpu/drm/i915/gem/i915_gem_context.c | 5 +- drivers/gpu/drm/i915/gem/i915_gem_domain.c | 6 +-- drivers/gpu/drm/i915/i915_driver.c | 34 ++++++------- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 3 +- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 10 ++-- drivers/gpu/drm/msm/dp/dp_display.c | 2 + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- drivers/gpu/drm/vc4/vc4_perfmon.c | 9 ++-- drivers/video/fbdev/core/fbmem.c | 12 +++++ include/linux/sysfb.h | 22 ++++++-- include/uapi/drm/drm_fourcc.h | 4 +- 18 files changed, 136 insertions(+), 62 deletions(-)