dri-devel July 2020

dri-devel@lists.freedesktop.org

336 participants
772 discussions

[PATCH -next] gpu: drm: Fix spinlock vblank_time_lock use error.
by Xu Qiang 22 Jul '20

22 Jul '20

The drm_handle_vblank function is in the interrupt context. Therefore, the spin lock vblank_time_lock is obtained from the interrupt context. Cc: <stable(a)vger.kernel.org> Signed-off-by: Xu Qiang <xuqiang36(a)huawei.com> --- drivers/gpu/drm/drm_vblank.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c index f402c75b9d34..4ca63ff33a43 100644 --- a/drivers/gpu/drm/drm_vblank.c +++ b/drivers/gpu/drm/drm_vblank.c @@ -229,10 +229,11 @@ static void drm_reset_vblank_timestamp(struct drm_device *dev, unsigned int pipe { u32 cur_vblank; bool rc; + unsigned long irqflags; ktime_t t_vblank; int count = DRM_TIMESTAMP_MAXRETRIES; - spin_lock(&dev->vblank_time_lock); + spin_lock_irqsave(&dev->vblank_time_lock, irqflags); /* * sample the current counter to avoid random jumps @@ -257,7 +258,7 @@ static void drm_reset_vblank_timestamp(struct drm_device *dev, unsigned int pipe */ store_vblank(dev, pipe, 1, t_vblank, cur_vblank); - spin_unlock(&dev->vblank_time_lock); + spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); } /* @@ -1106,11 +1107,12 @@ static int __enable_vblank(struct drm_device *dev, unsigned int pipe) static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe) { struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; + unsigned long irqflags; int ret = 0; assert_spin_locked(&dev->vbl_lock); - spin_lock(&dev->vblank_time_lock); + spin_lock_irqsave(&dev->vblank_time_lock, irqflags); if (!vblank->enabled) { /* @@ -1136,7 +1138,7 @@ static int drm_vblank_enable(struct drm_device *dev, unsigned int pipe) } } - spin_unlock(&dev->vblank_time_lock); + spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags); return ret; } @@ -1917,6 +1919,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) { struct drm_vblank_crtc *vblank = &dev->vblank[pipe]; unsigned long irqflags; + unsigned long irqflags_vblank; bool disable_irq; if (drm_WARN_ON_ONCE(dev, !drm_dev_has_vblank(dev))) @@ -1931,18 +1934,18 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe) * vblank enable/disable, as this would cause inconsistent * or corrupted timestamps and vblank counts. */ - spin_lock(&dev->vblank_time_lock); + spin_lock_irqsave(&dev->vblank_time_lock, irqflags_vblank); /* Vblank irq handling disabled. Nothing to do. */ if (!vblank->enabled) { - spin_unlock(&dev->vblank_time_lock); + spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags_vblank); spin_unlock_irqrestore(&dev->event_lock, irqflags); return false; } drm_update_vblank_count(dev, pipe, true); - spin_unlock(&dev->vblank_time_lock); + spin_unlock_irqrestore(&dev->vblank_time_lock, irqflags_vblank); wake_up(&vblank->queue); -- 2.25.0

2 1

[PATCH v1] drm/i915/dsi: Drop double check for ACPI companion device
by Andy Shevchenko 22 Jul '20

22 Jul '20

acpi_dev_get_resources() does perform the NULL pointer check against ACPI companion device which is given as function parameter. Thus, there is no need to duplicate this check in the caller. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 24 ++++++++------------ 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index 574dcfec9577..6f9e08cda964 100644 --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -426,23 +426,19 @@ static void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, { struct drm_device *drm_dev = intel_dsi->base.base.dev; struct device *dev = &drm_dev->pdev->dev; - struct acpi_device *acpi_dev; + struct acpi_device *acpi_dev = ACPI_COMPANION(dev); struct list_head resource_list; struct i2c_adapter_lookup lookup; - acpi_dev = ACPI_COMPANION(dev); - if (acpi_dev) { - memset(&lookup, 0, sizeof(lookup)); - lookup.slave_addr = slave_addr; - lookup.intel_dsi = intel_dsi; - lookup.dev_handle = acpi_device_handle(acpi_dev); - - INIT_LIST_HEAD(&resource_list); - acpi_dev_get_resources(acpi_dev, &resource_list, - i2c_adapter_lookup, - &lookup); - acpi_dev_free_resource_list(&resource_list); - } + memset(&lookup, 0, sizeof(lookup)); + lookup.slave_addr = slave_addr; + lookup.intel_dsi = intel_dsi; + lookup.dev_handle = acpi_device_handle(acpi_dev); + + INIT_LIST_HEAD(&resource_list); + acpi_dev_get_resources(acpi_dev, &resource_list, + i2c_adapter_lookup, &lookup); + acpi_dev_free_resource_list(&resource_list); } #else static inline void i2c_acpi_find_adapter(struct intel_dsi *intel_dsi, -- 2.26.2

2 2

[PATCH 00/20] Documentation: eliminate duplicated words
by Randy Dunlap 22 Jul '20

22 Jul '20

Drop doubled words in various parts of Documentation/. Cc: Jonathan Corbet <corbet(a)lwn.net> Cc: linux-doc(a)vger.kernel.org Cc: linux-mm(a)vger.kernel.org Cc: Mike Rapoport <rppt(a)kernel.org> Cc: Jens Axboe <axboe(a)kernel.dk> Cc: linux-block(a)vger.kernel.org Cc: Jason Wessel <jason.wessel(a)windriver.com> Cc: Daniel Thompson <daniel.thompson(a)linaro.org> Cc: Douglas Anderson <dianders(a)chromium.org> Cc: kgdb-bugreport(a)lists.sourceforge.net Cc: Wu Hao <hao.wu(a)intel.com> Cc: linux-fpga(a)vger.kernel.org Cc: James (Qian) Wang <james.qian.wang(a)arm.com> Cc: Liviu Dudau <liviu.dudau(a)arm.com> Cc: Mihail Atanassov <mihail.atanassov(a)arm.com> Cc: Mali DP Maintainers <malidp(a)foss.arm.com> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel(a)lists.freedesktop.org Cc: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> Cc: Jiri Kosina <jikos(a)kernel.org> Cc: linux-input(a)vger.kernel.org Cc: Wolfram Sang <wsa(a)kernel.org> Cc: linux-i2c(a)vger.kernel.org Cc: Masahiro Yamada <masahiroy(a)kernel.org> Cc: Michal Marek <michal.lkml(a)markovi.net> Cc: linux-kbuild(a)vger.kernel.org Cc: Jacek Anaszewski <jacek.anaszewski(a)gmail.com> Cc: Pavel Machek <pavel(a)ucw.cz> Cc: Dan Murphy <dmurphy(a)ti.com> Cc: linux-leds(a)vger.kernel.org Cc: Dan Williams <dan.j.williams(a)intel.com> Cc: Paul Cercueil <paul(a)crapouillou.net> Cc: Thomas Bogendoerfer <tsbogend(a)alpha.franken.de> Cc: linux-mips(a)vger.kernel.org Cc: Derek Kiernan <derek.kiernan(a)xilinx.com> Cc: Dragan Cvetic <dragan.cvetic(a)xilinx.com> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Paul Mackerras <paulus(a)samba.org> Cc: linuxppc-dev(a)lists.ozlabs.org Cc: Tony Krowiak <akrowiak(a)linux.ibm.com> Cc: Pierre Morel <pmorel(a)linux.ibm.com> Cc: Halil Pasic <pasic(a)linux.ibm.com> Cc: linux-s390(a)vger.kernel.org Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Hannes Reinecke <hare(a)suse.com> Cc: linux-scsi(a)vger.kernel.org Cc: "James E.J. Bottomley" <jejb(a)linux.ibm.com> Cc: "Martin K. Petersen" <martin.petersen(a)oracle.com> Cc: James Bottomley <jejb(a)linux.ibm.com> Cc: Jarkko Sakkinen <jarkko.sakkinen(a)linux.intel.com> Cc: Mimi Zohar <zohar(a)linux.ibm.com> Cc: linux-integrity(a)vger.kernel.org Cc: keyrings(a)vger.kernel.org Cc: Paolo Bonzini <pbonzini(a)redhat.com> Cc: kvm(a)vger.kernel.org Cc: Andrew Morton <akpm(a)linux-foundation.org> Documentation/admin-guide/mm/numaperf.rst | 2 +- Documentation/block/pr.rst | 2 +- Documentation/core-api/printk-basics.rst | 2 +- Documentation/dev-tools/kgdb.rst | 2 +- Documentation/fpga/dfl.rst | 2 +- Documentation/gpu/drm-uapi.rst | 2 +- Documentation/gpu/komeda-kms.rst | 2 +- Documentation/hid/intel-ish-hid.rst | 2 +- Documentation/i2c/upgrading-clients.rst | 2 +- Documentation/kbuild/kconfig-language.rst | 2 +- Documentation/leds/ledtrig-transient.rst | 2 +- Documentation/maintainer/maintainer-entry-profile.rst | 2 +- Documentation/mips/ingenic-tcu.rst | 2 +- Documentation/misc-devices/xilinx_sdfec.rst | 2 +- Documentation/powerpc/vas-api.rst | 2 +- Documentation/s390/vfio-ap.rst | 2 +- Documentation/scsi/advansys.rst | 2 +- Documentation/security/keys/trusted-encrypted.rst | 2 +- Documentation/virt/kvm/api.rst | 2 +- Documentation/vm/memory-model.rst | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-)

20 42

[PULL] drm-misc-next
by Maarten Lankhorst 22 Jul '20

22 Jul '20

drm-misc-next-2020-07-22: drm-misc-next for v5.9: UAPI Changes: Cross-subsystem Changes: - Convert panel-dsi-cm and ingenic bindings to YAML. - Add lockdep annotations for dma-fence. \o/ - Describe why indefinite fences are a bad idea - Update binding for rocktech jh057n00900. Core Changes: - Add vblank workers. - Use spin_(un)lock_irq instead of the irqsave/restore variants in crtc code. - Add managed vram helpers. - Convert more logging to drm functions. - Replace more http links with https in core and drivers. - Cleanup to ttm iomem functions and implementation. - Remove TTM CMA memtype as it doesn't work correctly. - Remove TTM_MEMTYPE_FLAG_MAPPABLE for many drivers that have no unmappable memory resources. Driver Changes: - Add CRC support to nouveau, using the new vblank workers. - Dithering and atomic state fix for nouveau. - Fixes for Frida FRD350H54004 panel. - Add support for OSD mode (sprite planes), IPU (scaling) and multiple panels/bridges to ingenic. - Use managed vram helpers in ast. - Assorted small fixes to ingenic, i810, mxsfb. - Remove optional unused ttm dummy functions. The following changes since commit 947fcfeac3295ff0961bb50803e0c4ae63cff65b: drm: drm_rect.h: delete duplicated word in comment (2020-07-15 14:03:02 +0200) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2020-07-22 for you to fetch changes up to acc0c39a59ccd8161b9066265fb8798b4ee07dc9: dt-binding: display: Allow a single port node on rocktech, jh057n00900 (2020-07-21 09:34:23 -0600) ---------------------------------------------------------------- drm-misc-next for v5.9: UAPI Changes: Cross-subsystem Changes: - Convert panel-dsi-cm and ingenic bindings to YAML. - Add lockdep annotations for dma-fence. \o/ - Describe why indefinite fences are a bad idea - Update binding for rocktech jh057n00900. Core Changes: - Add vblank workers. - Use spin_(un)lock_irq instead of the irqsave/restore variants in crtc code. - Add managed vram helpers. - Convert more logging to drm functions. - Replace more http links with https in core and drivers. - Cleanup to ttm iomem functions and implementation. - Remove TTM CMA memtype as it doesn't work correctly. - Remove TTM_MEMTYPE_FLAG_MAPPABLE for many drivers that have no unmappable memory resources. Driver Changes: - Add CRC support to nouveau, using the new vblank workers. - Dithering and atomic state fix for nouveau. - Fixes for Frida FRD350H54004 panel. - Add support for OSD mode (sprite planes), IPU (scaling) and multiple panels/bridges to ingenic. - Use managed vram helpers in ast. - Assorted small fixes to ingenic, i810, mxsfb. - Remove optional unused ttm dummy functions. ---------------------------------------------------------------- Alexander A. Klimov (4): drm/vboxvideo: Replace HTTP links with HTTPS ones drm/tidss: Replace HTTP links with HTTPS ones drm: Replace HTTP links with HTTPS ones video: fbdev: Replace HTTP links with HTTPS ones Christian König (9): drm/vram-helper: stop using TTM_MEMTYPE_FLAG_MAPPABLE drm: remove optional dummy function from drivers using TTM drm/ttm: cleanup io_mem interface with nouveau drm/ttm: remove io_reserve_fastpath flag drm/ttm: cleanup coding style and implementation. drm/ttm: remove TTM_MEMTYPE_FLAG_CMA drm/vmwgfx: stop using TTM_MEMTYPE_FLAG_MAPPABLE drm/nouveau: stop using TTM_MEMTYPE_FLAG_MAPPABLE drm/qxl: stop using TTM_MEMTYPE_FLAG_MAPPABLE v2 Christophe JAILLET (1): drm/i810: switch from 'pci_' to 'dma_' API Daniel Vetter (3): dma-fence: basic lockdep annotations dma-fence: prime lockdep annotations dma-buf.rst: Document why indefinite fences are a bad idea Guido Günther (1): drm/mxsfb: Make supported modifiers explicit Lyude Paul (15): drm/vblank: Register drmm cleanup action once per drm_vblank_crtc drm/vblank: Use spin_(un)lock_irq() in drm_crtc_vblank_off() drm/vblank: Add vblank works drm/nouveau/kms/nv140-: Don't modify depth in state during atomic commit drm/nouveau/kms/nv50-: Fix disabling dithering drm/nouveau/kms/nv140-: Track wndw mappings in nv50_head_atom drm/nouveau/kms/nv50-: Expose nv50_outp_atom in disp.h drm/nouveau/kms/nv50-: Move hard-coded object handles into header drm/nouveau/kms/nvd9-: Add CRC support drm/nouveau/kms/nvd9-: Fix disabling CRCs alongside OR reprogramming drm/vblank: Use spin_(un)lock_irq() in drm_crtc_vblank_reset() drm/vblank: Use spin_(un)lock_irq() in drm_crtc_vblank_on() drm/vblank: Use spin_(un)lock_irq() in drm_legacy_vblank_post_modeset() drm/vblank: Use spin_(un)lock_irq() in drm_queue_vblank_event() drm/vblank: Use spin_(un)lock_irq() in drm_crtc_queue_sequence_ioctl() Ondrej Jirman (2): dt-bindings: display: Fix example in nwl-dsi.yaml dt-binding: display: Allow a single port node on rocktech, jh057n00900 Paul Cercueil (15): drm/panel-simple: Fix inverted V/H SYNC for Frida FRD350H54004 panel drm/panel-simple: Add 50 Hz mode to the Frida FRD350H54004 panel drm/ingenic: Fix incorrect assumption about plane->index dt-bindings: display: Convert ingenic,lcd.txt to YAML dt-bindings: display: Add ingenic,ipu.yaml drm/ingenic: Rename ingenic-drm.c to ingenic-drm-drv.c drm/ingenic: Add missing CR in debug strings drm/ingenic: Set DMA descriptor chain address in probe drm/ingenic: Move register definitions to ingenic-drm.h drm/ingenic: Use dmam_alloc_coherent() drm/ingenic: Add support for OSD mode drm/ingenic: Add support for the IPU drm/ingenic: Support multiple panels/bridges drm/ingenic: Bump driver to version 1.1 drm/ingenic: Silence uninitialized-variable warning Sebastian Reichel (1): dt-bindings: display: panel-dsi-cm: convert to YAML Suraj Upadhyay (1): drm: core: Convert device logging to drm_* functions. Thomas Zimmermann (6): drm/vram-helper: Managed vram helpers drm/ast: Rename ast_ttm.c to ast_mm.c drm/ast: Use managed VRAM-helper initialization drm/ast: Move VRAM size detection to ast_mm.c drm/ast: Initialize DRAM type before posting GPU drm/ast: Use managed MM initialization Uwe Kleine-König (1): drm/mxsfb: drop unused function parameter .../bindings/display/bridge/nwl-dsi.yaml | 9 +- .../devicetree/bindings/display/ingenic,ipu.yaml | 65 ++ .../devicetree/bindings/display/ingenic,lcd.txt | 45 -- .../devicetree/bindings/display/ingenic,lcd.yaml | 126 +++ .../bindings/display/panel/panel-dsi-cm.txt | 29 - .../bindings/display/panel/panel-dsi-cm.yaml | 86 +++ .../display/panel/rocktech,jh057n00900.yaml | 1 + Documentation/driver-api/dma-buf.rst | 82 ++ Documentation/fb/ep93xx-fb.rst | 2 +- Documentation/gpu/drm-kms.rst | 15 + Documentation/gpu/vgaarbiter.rst | 8 +- drivers/dma-buf/dma-fence.c | 207 +++++ drivers/dma-buf/dma-resv.c | 8 + drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 9 +- drivers/gpu/drm/ast/Makefile | 2 +- drivers/gpu/drm/ast/ast_drv.h | 2 - drivers/gpu/drm/ast/ast_main.c | 45 +- drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} | 77 +- drivers/gpu/drm/drm_edid.c | 6 +- drivers/gpu/drm/drm_gem_cma_helper.c | 4 +- drivers/gpu/drm/drm_gem_vram_helper.c | 98 +-- drivers/gpu/drm/drm_internal.h | 27 + drivers/gpu/drm/drm_mipi_dbi.c | 7 +- drivers/gpu/drm/drm_modes.c | 2 +- drivers/gpu/drm/drm_vblank.c | 101 +-- drivers/gpu/drm/drm_vblank_work.c | 267 +++++++ drivers/gpu/drm/i810/i810_dma.c | 10 +- drivers/gpu/drm/ingenic/Kconfig | 11 + drivers/gpu/drm/ingenic/Makefile | 2 + .../ingenic/{ingenic-drm.c => ingenic-drm-drv.c} | 670 ++++++++++------ drivers/gpu/drm/ingenic/ingenic-drm.h | 173 +++++ drivers/gpu/drm/ingenic/ingenic-ipu.c | 853 +++++++++++++++++++++ drivers/gpu/drm/ingenic/ingenic-ipu.h | 109 +++ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 13 +- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 25 +- drivers/gpu/drm/nouveau/dispnv50/Kbuild | 4 + drivers/gpu/drm/nouveau/dispnv50/atom.h | 21 + drivers/gpu/drm/nouveau/dispnv50/core.h | 4 + drivers/gpu/drm/nouveau/dispnv50/core907d.c | 3 + drivers/gpu/drm/nouveau/dispnv50/core917d.c | 3 + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 3 + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 3 + drivers/gpu/drm/nouveau/dispnv50/crc.c | 751 ++++++++++++++++++ drivers/gpu/drm/nouveau/dispnv50/crc.h | 131 ++++ drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 139 ++++ drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 153 ++++ drivers/gpu/drm/nouveau/dispnv50/disp.c | 69 +- drivers/gpu/drm/nouveau/dispnv50/disp.h | 24 + drivers/gpu/drm/nouveau/dispnv50/handles.h | 16 + drivers/gpu/drm/nouveau/dispnv50/head.c | 98 ++- drivers/gpu/drm/nouveau/dispnv50/head.h | 12 +- drivers/gpu/drm/nouveau/dispnv50/head907d.c | 14 +- drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 27 +- drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 20 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 3 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 17 +- drivers/gpu/drm/nouveau/nouveau_display.c | 60 +- drivers/gpu/drm/panel/panel-simple.c | 40 +- drivers/gpu/drm/qxl/qxl_ttm.c | 15 +- drivers/gpu/drm/radeon/radeon_ttm.c | 7 +- drivers/gpu/drm/tidss/tidss_crtc.c | 2 +- drivers/gpu/drm/tidss/tidss_crtc.h | 2 +- drivers/gpu/drm/tidss/tidss_dispc.c | 2 +- drivers/gpu/drm/tidss/tidss_dispc.h | 2 +- drivers/gpu/drm/tidss/tidss_dispc_regs.h | 2 +- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- drivers/gpu/drm/tidss/tidss_drv.h | 2 +- drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- drivers/gpu/drm/tidss/tidss_encoder.h | 2 +- drivers/gpu/drm/tidss/tidss_irq.c | 2 +- drivers/gpu/drm/tidss/tidss_irq.h | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.h | 2 +- drivers/gpu/drm/tidss/tidss_plane.c | 2 +- drivers/gpu/drm/tidss/tidss_plane.h | 2 +- drivers/gpu/drm/tidss/tidss_scale_coefs.c | 2 +- drivers/gpu/drm/tidss/tidss_scale_coefs.h | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 35 +- drivers/gpu/drm/ttm/ttm_bo_util.c | 103 ++- drivers/gpu/drm/vboxvideo/hgsmi_defs.h | 2 +- drivers/gpu/drm/vboxvideo/vbox_hgsmi.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 20 +- drivers/video/fbdev/Kconfig | 8 +- drivers/video/fbdev/core/fbmon.c | 4 +- drivers/video/fbdev/ep93xx-fb.c | 2 +- drivers/video/fbdev/grvga.c | 2 +- drivers/video/fbdev/macfb.c | 2 +- drivers/video/fbdev/metronomefb.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 4 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 2 +- drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 2 +- drivers/video/fbdev/sa1100fb.c | 2 +- include/drm/drm_gem_vram_helper.h | 3 + include/drm/drm_vblank.h | 20 + include/drm/drm_vblank_work.h | 71 ++ include/drm/ttm/ttm_bo_driver.h | 3 - include/linux/dma-fence.h | 13 + include/uapi/drm/drm_mode.h | 2 +- 102 files changed, 4397 insertions(+), 782 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/ingenic,ipu.yaml delete mode 100644 Documentation/devicetree/bindings/display/ingenic,lcd.txt create mode 100644 Documentation/devicetree/bindings/display/ingenic,lcd.yaml delete mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt create mode 100644 Documentation/devicetree/bindings/display/panel/panel-dsi-cm.yaml rename drivers/gpu/drm/ast/{ast_ttm.c => ast_mm.c} (63%) create mode 100644 drivers/gpu/drm/drm_vblank_work.c rename drivers/gpu/drm/ingenic/{ingenic-drm.c => ingenic-drm-drv.c} (54%) create mode 100644 drivers/gpu/drm/ingenic/ingenic-drm.h create mode 100644 drivers/gpu/drm/ingenic/ingenic-ipu.c create mode 100644 drivers/gpu/drm/ingenic/ingenic-ipu.h create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc.c create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc.h create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crc907d.c create mode 100644 drivers/gpu/drm/nouveau/dispnv50/crcc37d.c create mode 100644 drivers/gpu/drm/nouveau/dispnv50/handles.h create mode 100644 include/drm/drm_vblank_work.h

1 0

[PULL] drm-misc-fixes
by Thomas Zimmermann 22 Jul '20

22 Jul '20

Hi Dave and Daniel, here's this week's PR for drm-misc-fixes. There are only 2 fixes. The sun4i patch updates a bugfix that was merged via drm-misc-fixes a few weeks ago. Best regards Thomas drm-misc-fixes-2020-07-22: * sun4i: Fix inverted HPD result; fixes an earlier fix * lima: fix timeout during reset The following changes since commit 6348dd291e3653534a9e28e6917569bc9967b35b: dmabuf: use spinlock to access dmabuf->name (2020-07-10 15:39:29 +0530) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-fixes-2020-07-22 for you to fetch changes up to f3f90c6db188d437add55aaffadd5ad5bcb8cda6: drm/lima: fix wait pp reset timeout (2020-07-20 08:46:06 +0800) ---------------------------------------------------------------- * sun4i: Fix inverted HPD result; fixes an earlier fix * lima: fix timeout during reset ---------------------------------------------------------------- Chen-Yu Tsai (1): drm: sun4i: hdmi: Fix inverted HPD result Qiang Yu (1): drm/lima: fix wait pp reset timeout drivers/gpu/drm/lima/lima_pp.c | 2 ++ drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

drm/panel: remove return value of function drm_panel_add which always return true.
by Bernard 22 Jul '20

22 Jul '20

Hi: The function "int drm_panel_add(struct drm_panel *panel)" always returns true, this return value is meaningless. So I am planning to optimize this function to a non-return implementation, "void drm_panel_add(struct drm_panel *panel)". In order to achieve this optimization, I need to submit a patch series: First, modify the code of each submodule that depends on the return value of this function; And last, replace the declaration in the drm_panel.h file and implementation in the drm_panel.c file; Do you mind this optimization? Looking forward to your reply and suggestions! BR//Bernard

2 1

[PATCH -next] drm/amdgpu/vcn3.0: Remove set but not used variable 'direct_poll'
by YueHaibing 22 Jul '20

22 Jul '20

drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c: In function vcn_v3_0_start_sriov: drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c:1235:3: warning: variable direct_poll set but not used [-Wunused-but-set-variable] It is never used, so can remove it. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c index 910a4a32ff78..53f680134c40 100644 --- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c @@ -1231,8 +1231,6 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev) direct_wt = { {0} }; struct mmsch_v3_0_cmd_direct_read_modify_write direct_rd_mod_wt = { {0} }; - struct mmsch_v3_0_cmd_direct_polling - direct_poll = { {0} }; struct mmsch_v3_0_cmd_end end = { {0} }; struct mmsch_v3_0_init_header header; @@ -1240,8 +1238,6 @@ static int vcn_v3_0_start_sriov(struct amdgpu_device *adev) MMSCH_COMMAND__DIRECT_REG_WRITE; direct_rd_mod_wt.cmd_header.command_type = MMSCH_COMMAND__DIRECT_REG_READ_MODIFY_WRITE; - direct_poll.cmd_header.command_type = - MMSCH_COMMAND__DIRECT_REG_POLLING; end.cmd_header.command_type = MMSCH_COMMAND__END; -- 2.17.1

1 0

[PATCH] drm/panel: remove meaningless if(ret) check code.
by Bernard Zhao 22 Jul '20

22 Jul '20

The function drm_panel_add always returns true. So if(ret) check code will never run into error branch. Remove these check will make the code a bit readable. Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c index 95b789ab9d29..2c168a405928 100644 --- a/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c +++ b/drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c @@ -225,9 +225,7 @@ static int feiyang_dsi_probe(struct mipi_dsi_device *dsi) if (ret) return ret; - ret = drm_panel_add(&ctx->panel); - if (ret < 0) - return ret; + drm_panel_add(&ctx->panel); dsi->mode_flags = MIPI_DSI_MODE_VIDEO_BURST; dsi->format = MIPI_DSI_FMT_RGB888; -- 2.17.1

1 0

[PATCH] drm/panel: remove meaningless if(ret) check code.
by Bernard Zhao 22 Jul '20

22 Jul '20

The function drm_panel_add always returns true. So if(ret) check code will never run into error branch. Remove these check make the code a bit readable. Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c index fddbfddf6566..7f2eb54e4254 100644 --- a/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c +++ b/drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c @@ -478,9 +478,7 @@ static int k101_im2ba02_dsi_probe(struct mipi_dsi_device *dsi) if (ret) return ret; - ret = drm_panel_add(&ctx->panel); - if (ret < 0) - return ret; + drm_panel_add(&ctx->panel); dsi->mode_flags = MIPI_DSI_MODE_VIDEO; dsi->format = MIPI_DSI_FMT_RGB888; -- 2.17.1

1 0

[PATCH v4] Revert "drm/amd/display: Expose connector VRR range via debugfs"
by Manasi Navare 22 Jul '20

22 Jul '20

From: Bhanuprakash Modem <bhanuprakash.modem(a)intel.com> v3: * Rebase (Manasi) v2: * Rebase (Manasi) As both VRR min and max are already part of drm_display_info, drm can expose this VRR range for each connector. Hence this logic should move to core DRM. This reverts commit 727962f030c23422a01e8b22d0f463815fb15ec4. Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem(a)intel.com> Cc: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> Cc: Harry Wentland <harry.wentland(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Manasi Navare <manasi.d.navare(a)intel.com> Cc: AMD gfx <amd-gfx(a)lists.freedesktop.org> Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas(a)amd.com> --- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c index 1d692f4f42f3..b246354967bc 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c @@ -820,24 +820,6 @@ static int output_bpc_show(struct seq_file *m, void *data) return res; } -/* - * Returns the min and max vrr vfreq through the connector's debugfs file. - * Example usage: cat /sys/kernel/debug/dri/0/DP-1/vrr_range - */ -static int vrr_range_show(struct seq_file *m, void *data) -{ - struct drm_connector *connector = m->private; - struct amdgpu_dm_connector *aconnector = to_amdgpu_dm_connector(connector); - - if (connector->status != connector_status_connected) - return -ENODEV; - - seq_printf(m, "Min: %u\n", (unsigned int)aconnector->min_vfreq); - seq_printf(m, "Max: %u\n", (unsigned int)aconnector->max_vfreq); - - return 0; -} - #ifdef CONFIG_DRM_AMD_DC_HDCP /* * Returns the HDCP capability of the Display (1.4 for now). @@ -1001,7 +983,6 @@ static ssize_t dp_dpcd_data_read(struct file *f, char __user *buf, DEFINE_SHOW_ATTRIBUTE(dmub_fw_state); DEFINE_SHOW_ATTRIBUTE(dmub_tracebuffer); DEFINE_SHOW_ATTRIBUTE(output_bpc); -DEFINE_SHOW_ATTRIBUTE(vrr_range); #ifdef CONFIG_DRM_AMD_DC_HDCP DEFINE_SHOW_ATTRIBUTE(hdcp_sink_capability); #endif @@ -1058,7 +1039,6 @@ static const struct { {"link_settings", &dp_link_settings_debugfs_fops}, {"phy_settings", &dp_phy_settings_debugfs_fop}, {"test_pattern", &dp_phy_test_pattern_fops}, - {"vrr_range", &vrr_range_fops}, #ifdef CONFIG_DRM_AMD_DC_HDCP {"hdcp_sink_capability", &hdcp_sink_capability_fops}, #endif -- 2.19.1

2 1

← Newer
1
...
36
37
38
39
40
41
42
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2020