dri-devel April 2020

dri-devel@lists.freedesktop.org

353 participants
944 discussions

[PATCH v2] drm: rcar-du: Set primary plane zpos immutably at initializing
by Laurent Pinchart 04 Apr '20

04 Apr '20

From: Tomohito Esaki <etom(a)igel.co.jp> According to drm_plane_create_zpos_property() function documentation, all planes zpos range should be set if zpos property is supported. However, the rcar-du driver didn't set primary plane zpos range. Since the primary plane's zpos is fixed, set it immutably. Reported-by: Yoshihito Ogawa <yoshihito.ogawa.kc(a)renesas.com> Reported-by: Koji Matsuoka <koji.matsuoka.xm(a)renesas.com> Signed-off-by: Tomohito Esaki <etom(a)igel.co.jp> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> Reviewed-by: Daniel Stone <daniels(a)collabora.com> [Turn continue into if ... else ...] Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas(a)ideasonboard.com> --- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 16 +++++++++------- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 14 ++++++++------ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_plane.c b/drivers/gpu/drm/rcar-du/rcar_du_plane.c index c6430027169f..a0021fc25b27 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_plane.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_plane.c @@ -785,13 +785,15 @@ int rcar_du_planes_init(struct rcar_du_group *rgrp) drm_plane_create_alpha_property(&plane->plane); - if (type == DRM_PLANE_TYPE_PRIMARY) - continue; - - drm_object_attach_property(&plane->plane.base, - rcdu->props.colorkey, - RCAR_DU_COLORKEY_NONE); - drm_plane_create_zpos_property(&plane->plane, 1, 1, 7); + if (type == DRM_PLANE_TYPE_PRIMARY) { + drm_plane_create_zpos_immutable_property(&plane->plane, + 0); + } else { + drm_object_attach_property(&plane->plane.base, + rcdu->props.colorkey, + RCAR_DU_COLORKEY_NONE); + drm_plane_create_zpos_property(&plane->plane, 1, 1, 7); + } } return 0; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 5e4faf258c31..f1a81c9b184d 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -392,12 +392,14 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp, struct device_node *np, drm_plane_helper_add(&plane->plane, &rcar_du_vsp_plane_helper_funcs); - if (type == DRM_PLANE_TYPE_PRIMARY) - continue; - - drm_plane_create_alpha_property(&plane->plane); - drm_plane_create_zpos_property(&plane->plane, 1, 1, - vsp->num_planes - 1); + if (type == DRM_PLANE_TYPE_PRIMARY) { + drm_plane_create_zpos_immutable_property(&plane->plane, + 0); + } else { + drm_plane_create_alpha_property(&plane->plane); + drm_plane_create_zpos_property(&plane->plane, 1, 1, + vsp->num_planes - 1); + } } return 0; -- Regards, Laurent Pinchart

1 0

[drm-tip:drm-tip 9/10] drivers/staging/rtl8712/rtl8712_xmit.c:360:18: error: incompatible pointer types initializing 'struct tx_desc *' with an expression of type 'u8 *' (aka 'unsigned char *')
by kbuild test robot 04 Apr '20

04 Apr '20

Hi Ville, First bad commit (maybe != root cause): tree: git://anongit.freedesktop.org/drm/drm-tip drm-tip head: 06ddf8dd059d59bc27c24b09a6e500809e619982 commit: 02f01c7089f8aadbf676f8d8aad6e0bccac8c46a [9/10] Merge remote-tracking branch 'drm_intel_push/topic/core-for-CI' into drm-tip config: x86_64-allyesconfig (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project b7397e81fe4dee8ffd4a1353bf0cf3a7d2ed267b) reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 02f01c7089f8aadbf676f8d8aad6e0bccac8c46a # save the attached .config to linux build tree COMPILER=clang make.cross ARCH=x86_64 If you fix the issue, kindly add following tag as appropriate Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): >> drivers/staging/rtl8712/rtl8712_xmit.c:360:18: error: incompatible pointer types initializing 'struct tx_desc *' with an expression of type 'u8 *' (aka 'unsigned char *') [-Werror,-Wincompatible-pointer-types] struct tx_desc *ptxdesc = pxmitbuf->pbuf; ^ ~~~~~~~~~~~~~~ 1 error generated. -- In file included from drivers/staging/greybus/camera.c:19: >> drivers/staging/greybus/gb-camera.h:33:27: error: field has incomplete type 'enum v4l2_mbus_pixelcode' enum v4l2_mbus_pixelcode pixel_code; ^ drivers/staging/greybus/gb-camera.h:33:7: note: forward declaration of 'enum v4l2_mbus_pixelcode' enum v4l2_mbus_pixelcode pixel_code; ^ >> drivers/staging/greybus/camera.c:20:10: fatal error: 'greybus_protocols.h' file not found #include "greybus_protocols.h" ^~~~~~~~~~~~~~~~~~~~~ 2 errors generated. -- >> drivers/staging/media/soc_camera/soc_mediabus.c:19:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "YUYV", ^ drivers/staging/media/soc_camera/soc_mediabus.c:29:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "YVYU", ^ drivers/staging/media/soc_camera/soc_mediabus.c:39:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "UYVY", ^ drivers/staging/media/soc_camera/soc_mediabus.c:49:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "VYUY", ^ drivers/staging/media/soc_camera/soc_mediabus.c:59:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB555", ^ drivers/staging/media/soc_camera/soc_mediabus.c:69:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB555X", ^ drivers/staging/media/soc_camera/soc_mediabus.c:79:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB565", ^ drivers/staging/media/soc_camera/soc_mediabus.c:89:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB565X", ^ drivers/staging/media/soc_camera/soc_mediabus.c:99:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB666/32bpp", ^ drivers/staging/media/soc_camera/soc_mediabus.c:108:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB888/32bpp", ^ drivers/staging/media/soc_camera/soc_mediabus.c:117:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB888/32bpp", ^ drivers/staging/media/soc_camera/soc_mediabus.c:126:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "RGB888/32bpp", ^ drivers/staging/media/soc_camera/soc_mediabus.c:135:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Bayer 8 BGGR", ^ drivers/staging/media/soc_camera/soc_mediabus.c:145:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Bayer 10 BGGR", ^ drivers/staging/media/soc_camera/soc_mediabus.c:155:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Grey", ^ drivers/staging/media/soc_camera/soc_mediabus.c:165:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Grey 10bit", ^ drivers/staging/media/soc_camera/soc_mediabus.c:175:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Bayer 10 BGGR", ^ drivers/staging/media/soc_camera/soc_mediabus.c:185:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Bayer 10 BGGR", ^ drivers/staging/media/soc_camera/soc_mediabus.c:195:4: error: field designator 'name' does not refer to any field in type 'struct soc_mbus_pixelfmt' .name = "Bayer 10 BGGR", ^ fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated. vim +360 drivers/staging/rtl8712/rtl8712_xmit.c 93c55dda092c7e Ali Bahar 2011-09-04 354 ca8a0a4934e0d8 Nishka Dasgupta 2019-08-13 355 void r8712_dump_aggr_xframe(struct xmit_buf *pxmitbuf, 93c55dda092c7e Ali Bahar 2011-09-04 356 struct xmit_frame *pxmitframe) 93c55dda092c7e Ali Bahar 2011-09-04 357 { 93c55dda092c7e Ali Bahar 2011-09-04 358 struct _adapter *padapter = pxmitframe->padapter; 993c307eb48acc Shivani Bhardwaj 2015-10-14 359 struct dvobj_priv *pdvobj = &padapter->dvobjpriv; 993c307eb48acc Shivani Bhardwaj 2015-10-14 @360 struct tx_desc *ptxdesc = pxmitbuf->pbuf; 93c55dda092c7e Ali Bahar 2011-09-04 361 struct cmd_hdr *pcmd_hdr = (struct cmd_hdr *) 93c55dda092c7e Ali Bahar 2011-09-04 362 (pxmitbuf->pbuf + TXDESC_SIZE); 93c55dda092c7e Ali Bahar 2011-09-04 363 u16 total_length = (u16) (ptxdesc->txdw0 & 0xffff); 93c55dda092c7e Ali Bahar 2011-09-04 364 93c55dda092c7e Ali Bahar 2011-09-04 365 /* use 1st xmitframe as media */ 93c55dda092c7e Ali Bahar 2011-09-04 366 xmitframe_xmitbuf_attach(pxmitframe, pxmitbuf); 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 367 pcmd_hdr->cmd_dw0 = cpu_to_le32(((total_length - CMD_HDR_SZ) & 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 368 0x0000ffff) | (pcmd_hdr->cmd_dw0 & 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 369 0xffff0000)); 93c55dda092c7e Ali Bahar 2011-09-04 370 93c55dda092c7e Ali Bahar 2011-09-04 371 /* urb length in cmd_dw1 */ 93c55dda092c7e Ali Bahar 2011-09-04 372 pcmd_hdr->cmd_dw1 = cpu_to_le32((pxmitbuf->aggr_nr & 0xff)| 93c55dda092c7e Ali Bahar 2011-09-04 373 ((total_length + TXDESC_SIZE) << 16)); 93c55dda092c7e Ali Bahar 2011-09-04 374 pxmitframe->last[0] = 1; 93c55dda092c7e Ali Bahar 2011-09-04 375 pxmitframe->bpending[0] = false; 93c55dda092c7e Ali Bahar 2011-09-04 376 pxmitframe->mem_addr = pxmitbuf->pbuf; 93c55dda092c7e Ali Bahar 2011-09-04 377 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 378 if ((pdvobj->ishighspeed && ((total_length + TXDESC_SIZE) % 0x200) == 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 379 0) || ((!pdvobj->ishighspeed && ((total_length + TXDESC_SIZE) % 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 380 0x40) == 0))) { 93c55dda092c7e Ali Bahar 2011-09-04 381 ptxdesc->txdw0 |= cpu_to_le32 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 382 (((TXDESC_SIZE + OFFSET_SZ + 8) << OFFSET_SHT) & 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 383 0x00ff0000); 93c55dda092c7e Ali Bahar 2011-09-04 384 /*32 bytes for TX Desc + 8 bytes pending*/ 93c55dda092c7e Ali Bahar 2011-09-04 385 } else { 93c55dda092c7e Ali Bahar 2011-09-04 386 ptxdesc->txdw0 |= cpu_to_le32 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 387 (((TXDESC_SIZE + OFFSET_SZ) << OFFSET_SHT) & 4ef2de5ae0377b Luis de Bethencourt 2015-10-19 388 0x00ff0000); 93c55dda092c7e Ali Bahar 2011-09-04 389 /*default = 32 bytes for TX Desc*/ 93c55dda092c7e Ali Bahar 2011-09-04 390 } 93c55dda092c7e Ali Bahar 2011-09-04 391 r8712_write_port(pxmitframe->padapter, RTL8712_DMA_H2CCMD, 93c55dda092c7e Ali Bahar 2011-09-04 392 total_length + TXDESC_SIZE, (u8 *)pxmitframe); 93c55dda092c7e Ali Bahar 2011-09-04 393 } 93c55dda092c7e Ali Bahar 2011-09-04 394 :::::: The code at line 360 was first introduced by commit :::::: 993c307eb48accf5fc34f703e6c290ddfc251b6e Staging: rtl8712: rtl8712_xmit: Remove useless cast :::::: TO: Shivani Bhardwaj <shivanib134(a)gmail.com> :::::: CC: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

[PULL] drm-misc-next-fixes
by Maxime Ripard 04 Apr '20

04 Apr '20

Hi Daniel, Dave, Here's this week round of drm-misc-next fixes. Thanks! Maxime drm-misc-next-fixes-2020-04-04: A bunch of fixes to avoid null pointer dereference in fbcon, fix a return in xen, some DT bindings fixes, a vc4 issue with 1920x1200 mode validation, and a conflicting framebuffer in vboxvideo. The following changes since commit 6afe6929964bca6847986d0507a555a041f07753: drm: Mark up racy check of drm_gem_object.handle_count (2020-03-16 10:31:35 +0000) are available in the Git repository at: git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-fixes-2020-04-04 for you to fetch changes up to d8a26d8fc37c5b8b9e95f2fa194f287cf8cab3f4: drm/mm: revert "Break long searches in fragmented address spaces" (2020-03-31 17:35:56 +0200) ---------------------------------------------------------------- A bunch of fixes to avoid null pointer dereference in fbcon, fix a return in xen, some DT bindings fixes, a vc4 issue with 1920x1200 mode validation, and a conflicting framebuffer in vboxvideo. ---------------------------------------------------------------- Christian König (1): drm/mm: revert "Break long searches in fragmented address spaces" Ding Xiang (1): drm/xen: fix passing zero to 'PTR_ERR' warning Geert Uytterhoeven (1): dma-buf: Improve CONFIG_DMABUF_MOVE_NOTIFY help text Hans de Goede (1): drm/vboxvideo: Add missing remove_conflicting_pci_framebuffers call, v2 Mauro Carvalho Chehab (1): docs: dt: display/ti: fix typos at the devicetree/ directory name Nicolas Saenz Julienne (1): drm/vc4: Fix HDMI mode validation Qiujun Huang (1): fbcon: fix null-ptr-deref in fbcon_switch Rob Herring (1): dt-bindings: display: ti: Fix dtc unit-address warnings in examples Sam Ravnborg (2): dt-bindings: display: drop data-mapping from panel-dpi drm/panel-simple: drop use of data-mapping property .../devicetree/bindings/display/panel/panel-dpi.yaml | 10 ---------- .../devicetree/bindings/display/ti/ti,am65x-dss.yaml | 4 ++-- .../devicetree/bindings/display/ti/ti,j721e-dss.yaml | 4 ++-- .../devicetree/bindings/display/ti/ti,k2g-dss.yaml | 4 ++-- drivers/dma-buf/Kconfig | 11 ++++++----- drivers/gpu/drm/drm_mm.c | 8 +------- drivers/gpu/drm/panel/panel-simple.c | 11 ----------- drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 ++++ drivers/gpu/drm/vc4/vc4_hdmi.c | 20 ++++++++++++++++---- drivers/gpu/drm/xen/xen_drm_front.c | 2 +- drivers/video/fbdev/core/fbcon.c | 3 +++ 11 files changed, 37 insertions(+), 44 deletions(-)

1 0

Re: [PATCH v3] drm/i915: Synchronize active and retire callbacks
by Sultan Alsawaf 04 Apr '20

04 Apr '20

On Fri, Apr 03, 2020 at 03:35:15PM -0700, Sultan Alsawaf wrote: > + ref->retire(ref); > + mutex_unlock(&ref->callback_lock); Ugh, this patch is still wrong because the mutex unlock after ref->retire() is a use-after-free. Fun times... Sultan

1 0

lima, panfrost: multiple definition of `of_devfreq_cooling_register_power'
by Thomas Zimmermann 03 Apr '20

03 Apr '20

Hi, building lima and panfrost drivers from drm-tip, I currently get the following linker error > make clean > make [...] LD vmlinux.o arm-suse-linux-gnueabi-ld: drivers/gpu/drm/panfrost /panfrost_devfreq.o: in function `of_devfreq_cooling_register_power': panfrost_devfreq.c:(.text+0x18c): multiple definition of `of_devfreq_cooling_register_power'; drivers/gpu/drm/lima /lima_devfreq.o:lima_devfreq.c:(.text+0x1a0): first defined here make[1]: *** [/home/tzimmermann/Projekte/linux/Makefile:1078: vmlinux] Error 1 make[1]: Leaving directory '/home/tzimmermann/Projekte/linux/build- arm' make: *** [Makefile:180: sub-make] Error 2 Seems related to commit 1996970773a323533e1cc1b6b97f00a95d675f32 Author: Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> Date: Thu Mar 19 21:34:27 2020 +0100 drm/lima: Add optional devfreq and cooling device support https://cgit.freedesktop.org/drm/drm-tip/commit/?id=1996970773a323533e1cc1b… Best regards Thomas -- 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

2 3

[PATCH] drm/amdgpu: Fix oops when pp_funcs is unset in ACPI event
by Aaron Ma 03 Apr '20

03 Apr '20

On ARCTURUS and RENOIR, powerplay is not supported yet. When plug in or unplug power jack, ACPI event will issue. Then kernel NULL pointer BUG will be triggered. Check for NULL pointers before calling. Signed-off-by: Aaron Ma <aaron.ma(a)canonical.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c index f197f1be0969..611de69f9d48 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c @@ -89,7 +89,8 @@ void amdgpu_pm_acpi_event_handler(struct amdgpu_device *adev) adev->pm.ac_power = true; else adev->pm.ac_power = false; - if (adev->powerplay.pp_funcs->enable_bapm) + if (adev->powerplay.pp_funcs && + adev->powerplay.pp_funcs->enable_bapm) amdgpu_dpm_enable_bapm(adev, adev->pm.ac_power); mutex_unlock(&adev->pm.mutex); -- 2.17.1

2 1

Re: [PATCH] drm/amd/display: Fix a compilation warning
by Markus Elfring 03 Apr '20

03 Apr '20

> When I compile the code in X86,there is a warning about > "'PixelPTEReqHeightPTES' may be used uninitialized in this function". Would you like to add the tag “Fixes” to the commit message? Regards, Markus

1 0

amdgpu dropping load callback triggers WARN_ON in __drm_mode_object_add
by Michel Dänzer 03 Apr '20

03 Apr '20

I'm getting the attached WARNING splats since amdgpu dropped its load callback. They're from WARN_ON(!dev->driver->load && dev->registered && !obj_free_cb); in __drm_mode_object_add. I'm not sure how to address this, since obj_free_cb is always NULL here, and I don't think MST connectors getting added after dev->registered is set can be avoided? -- Earthling Michel Dänzer | https://redhat.com Libre software enthusiast | Mesa and X developer

2 2

[PATCH v3 0/4] Move Mediatek HDMI PHY driver from DRM folder to PHY folder
by Chun-Kuang Hu 03 Apr '20

03 Apr '20

mtk_hdmi_phy is currently placed inside mediatek drm driver, but it's more suitable to place a phy driver into phy driver folder, so move mtk_hdmi_phy driver into phy driver folder. Changes in v3: - Modify [PATCH v2 3/4] prefix. Changes in v2: - include module.h in mtk_hdmi.c CK Hu (3): drm/mediatek: Move tz_disabled from mtk_hdmi_phy to mtk_hdmi driver drm/mediatek: Separate mtk_hdmi_phy to an independent module phy: mediatek: Move mtk_hdmi_phy driver into drivers/phy/mediatek folder Chun-Kuang Hu (1): MAINTAINERS: add files for Mediatek DRM drivers MAINTAINERS | 1 + drivers/gpu/drm/mediatek/Kconfig | 2 +- drivers/gpu/drm/mediatek/Makefile | 5 +--- drivers/gpu/drm/mediatek/mtk_hdmi.c | 24 +++++++++++++++---- drivers/gpu/drm/mediatek/mtk_hdmi.h | 1 - drivers/phy/mediatek/Kconfig | 7 ++++++ drivers/phy/mediatek/Makefile | 7 ++++++ .../mediatek/phy-mtk-hdmi-mt2701.c} | 3 +-- .../mediatek/phy-mtk-hdmi-mt8173.c} | 2 +- .../mediatek/phy-mtk-hdmi.c} | 3 ++- .../mediatek/phy-mtk-hdmi.h} | 2 -- 11 files changed, 41 insertions(+), 16 deletions(-) rename drivers/{gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt2701.c} (99%) rename drivers/{gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi-mt8173.c} (99%) rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.c => phy/mediatek/phy-mtk-hdmi.c} (98%) rename drivers/{gpu/drm/mediatek/mtk_hdmi_phy.h => phy/mediatek/phy-mtk-hdmi.h} (95%) -- 2.17.1

3 13

[PATCH 1/2] drm/pci: Move drm_pci_alloc/free under CONFIG_DRM_LEGACY
by Daniel Vetter 03 Apr '20

03 Apr '20

All other users have been removed, yay! Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- drivers/gpu/drm/drm_pci.c | 3 +++ include/drm/drm_legacy.h | 15 +++++++++++++++ include/drm/drm_pci.h | 26 -------------------------- 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 81aa21561982..131b7a139fda 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -36,6 +36,8 @@ #include "drm_internal.h" #include "drm_legacy.h" +#ifdef CONFIG_DRM_LEGACY + /** * drm_pci_alloc - Allocate a PCI consistent memory block, for DMA. * @dev: DRM device @@ -93,6 +95,7 @@ void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah) } EXPORT_SYMBOL(drm_pci_free); +#endif static int drm_get_pci_domain(struct drm_device *dev) { diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h index dcef3598f49e..b53c3686c5fc 100644 --- a/include/drm/drm_legacy.h +++ b/include/drm/drm_legacy.h @@ -194,11 +194,26 @@ void drm_legacy_idlelock_release(struct drm_lock_data *lock); #ifdef CONFIG_PCI +struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, + size_t align); +void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); + int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); #else +static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, + size_t size, size_t align) +{ + return NULL; +} + +static inline void drm_pci_free(struct drm_device *dev, + struct drm_dma_handle *dmah) +{ +} + static inline int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver) { diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h index 3941b0255ecf..1bf31131960e 100644 --- a/include/drm/drm_pci.h +++ b/include/drm/drm_pci.h @@ -34,30 +34,4 @@ #include <linux/pci.h> -struct drm_dma_handle; -struct drm_device; -struct drm_driver; -struct drm_master; - -#ifdef CONFIG_PCI - -struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size, - size_t align); -void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah); - -#else - -static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, - size_t size, size_t align) -{ - return NULL; -} - -static inline void drm_pci_free(struct drm_device *dev, - struct drm_dma_handle *dmah) -{ -} - -#endif - #endif /* _DRM_PCI_H_ */ -- 2.25.1

2 3

← Newer
1
...
88
89
90
91
92
93
94
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2020