dri-devel July 2020

dri-devel@lists.freedesktop.org

336 participants
772 discussions

Start a nNew thread

Re: [PATCH] drm/virtio: Fix memory leak in virtio_gpu_execbuffer_ioctl()
by Markus Elfring 20 Jul '20

20 Jul '20

* I suggest to add a change description. * Is “hexin.op” a real name? Regards, Markus

1 0

[PATCH 1/8] drm/ttm: remove TTM_MEMTYPE_FLAG_CMA
by Christian König 20 Jul '20

20 Jul '20

The original intention was to avoid CPU page table unmaps when BOs move between the GTT and SYSTEM domain. The problem is that this never correctly handled changes in the caching attributes or backing pages. Just drop this for now and simply unmap the CPU page tables in all cases. Signed-off-by: Christian König <christian.koenig(a)amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +-- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 34 ++++------------------ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 +- include/drm/ttm/ttm_bo_driver.h | 1 - 6 files changed, 11 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 9c0f12f74af9..44fa8bc49d18 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -93,7 +93,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, man->func = &amdgpu_gtt_mgr_func; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; break; case TTM_PL_VRAM: /* "On-card" video ram */ @@ -108,7 +108,7 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, case AMDGPU_PL_OA: /* On-chip GDS memory*/ man->func = &ttm_bo_manager_func; - man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_FIXED; man->available_caching = TTM_PL_FLAG_UNCACHED; man->default_caching = TTM_PL_FLAG_UNCACHED; break; diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index a1037478fa3f..7883341f8c83 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -695,8 +695,7 @@ nouveau_bo_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, TTM_PL_FLAG_WC; man->default_caching = TTM_PL_FLAG_WC; } else { - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | - TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; } diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 73085523fad7..54af06df865b 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c @@ -84,7 +84,7 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, man->func = &ttm_bo_manager_func; man->available_caching = TTM_PL_MASK_CACHING; man->default_caching = TTM_PL_FLAG_CACHED; - man->flags = TTM_MEMTYPE_FLAG_MAPPABLE | TTM_MEMTYPE_FLAG_CMA; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; #if IS_ENABLED(CONFIG_AGP) if (rdev->flags & RADEON_IS_AGP) { if (!rdev->ddev->agp) { diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 8b9e7f62bea7..0768a054a916 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -272,20 +272,15 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, struct ttm_operation_ctx *ctx) { struct ttm_bo_device *bdev = bo->bdev; - bool old_is_pci = ttm_mem_reg_is_pci(bdev, &bo->mem); - bool new_is_pci = ttm_mem_reg_is_pci(bdev, mem); struct ttm_mem_type_manager *old_man = &bdev->man[bo->mem.mem_type]; struct ttm_mem_type_manager *new_man = &bdev->man[mem->mem_type]; - int ret = 0; + int ret; - if (old_is_pci || new_is_pci || - ((mem->placement & bo->mem.placement & TTM_PL_MASK_CACHING) == 0)) { - ret = ttm_mem_io_lock(old_man, true); - if (unlikely(ret != 0)) - goto out_err; - ttm_bo_unmap_virtual_locked(bo); - ttm_mem_io_unlock(old_man); - } + ret = ttm_mem_io_lock(old_man, true); + if (unlikely(ret != 0)) + goto out_err; + ttm_bo_unmap_virtual_locked(bo); + ttm_mem_io_unlock(old_man); /* * Create and bind a ttm if required. @@ -1698,23 +1693,6 @@ EXPORT_SYMBOL(ttm_bo_device_init); * buffer object vm functions. */ -bool ttm_mem_reg_is_pci(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem) -{ - struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type]; - - if (!(man->flags & TTM_MEMTYPE_FLAG_FIXED)) { - if (mem->mem_type == TTM_PL_SYSTEM) - return false; - - if (man->flags & TTM_MEMTYPE_FLAG_CMA) - return false; - - if (mem->placement & TTM_PL_FLAG_CACHED) - return false; - } - return true; -} - void ttm_bo_unmap_virtual_locked(struct ttm_buffer_object *bo) { struct ttm_bo_device *bdev = bo->bdev; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c index bfd0c54ec30a..6bea7548aee0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c @@ -762,7 +762,7 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type, * slots as well as the bo size. */ man->func = &vmw_gmrid_manager_func; - man->flags = TTM_MEMTYPE_FLAG_CMA | TTM_MEMTYPE_FLAG_MAPPABLE; + man->flags = TTM_MEMTYPE_FLAG_MAPPABLE; man->available_caching = TTM_PL_FLAG_CACHED; man->default_caching = TTM_PL_FLAG_CACHED; break; diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index 45522e4fbd6b..71b195e78c7c 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h @@ -47,7 +47,6 @@ #define TTM_MEMTYPE_FLAG_FIXED (1 << 0) /* Fixed (on-card) PCI memory */ #define TTM_MEMTYPE_FLAG_MAPPABLE (1 << 1) /* Memory mappable */ -#define TTM_MEMTYPE_FLAG_CMA (1 << 3) /* Can't map aperture */ struct ttm_mem_type_manager; -- 2.17.1

3 12

[PATCH v5 0/19] backlight: backlight updates
by Sam Ravnborg 20 Jul '20

20 Jul '20

Hi all. Follow-up on v4 - with only a few changes listed below and in the individual patches. Thanks for all the reviews and the feedback on the patches! I am planning a follow-up on this patchset to update the backlight drivers all over to use backlight_get_brightness() and backlight_is_blank() as appropriate. v5: - Added r-b's - Updated cr_bllcd to use gpio-backlight semantics - Various editorial updates to changelogs - Rebased on top of Lee's backlight tree - Dropped "make of_find_backlight_by_node() static" The change depends on drm-misc-next. Will be re-send when the changes hits the backlight tree (We could have done this in other ways, but it is easier to just wait) v4: - Introduced backlight_get_brightness based on feedback from Emil. - Properly described the rationale behind more restrictive locking use I checked that locking was not used outside backlight core by renaming the lock fields. As it is not used seems OK to restrict use to the core. - Introducing backlight_get_brightness invalidated some patches and I did a bit finer split to ease review. - Added acks - A few small adjustments documented in the individual patches v3: - Dropped video patch that was reviewd and thus applied - Updated kernel-doc so all fields now have a short intro - Improved readability in a lot of places, thanks to review feedback from Daniel - thanks! - Added better intro to backlight - Added acks Several other smaller changes documented in the patches. I left out patches to make functions static as there are dependencies to drm-misc-next for these. v2: - Dropped drm patches that was reviewed and thus applied (Thanks Tomi) - Updated backligth_is_blank() based on Daniel's feedback - Dropped EXPORT_SYMBOL that was no longer relevant - Reordered patches, so patches with no external dependencies comes first - Updated the description that follows. The following series touches a lot of backlight things. Starts with a small refactoring in backligth.c to remove some indents. This increases the readability and no functional changes. Then two new helpers backlight_is_blank(), backlight_get_brightness() are added. These helpers simplifies the implementation of update_status() in the backlight drivers where they are used. Then while surfing the code I missed some documentation. So I got a bit carried away and updated the documentation for the backlight core and added it to kernel-doc. The documentation express my current understanding. Everything from spelling errors to outright wrong content shall be anticipated - so please review! We are all best helped if the documentation is correct and up-to-date and it is readable. In this process I identified that the backlight_bl driver was no longer in use - so drop it. Everything builds, but so far no run-time testing. Sam Sam Ravnborg (19): backlight: refactor fb_notifier_callback() backlight: add backlight_is_blank() backlight: improve backlight_ops documentation backlight: improve backlight_properties documentation backlight: improve backlight_device documentation backlight: document inline functions in backlight.h backlight: document enums in backlight.h backlight: remove the unused backlight_bl driver backlight: drop extern from prototypes backlight: add overview and update existing doc backlight: wire up kernel-doc documentation backlight: introduce backlight_get_brightness() backlight: as3711_bl: simplify update_status backlight: cr_bllcd: introduce gpio-backlight semantics backlight: gpio_backlight: simplify update_status() backlight: jornada720_bl: introduce backlight_is_blank() backlight: use backlight_get_brightness() backlight: drop backlight_put() backlight: make of_find_backlight static Documentation/gpu/backlight.rst | 12 + Documentation/gpu/index.rst | 1 + drivers/video/backlight/88pm860x_bl.c | 13 +- drivers/video/backlight/Kconfig | 8 - drivers/video/backlight/Makefile | 1 - drivers/video/backlight/adp5520_bl.c | 10 +- drivers/video/backlight/adp8860_bl.c | 10 +- drivers/video/backlight/adp8870_bl.c | 10 +- drivers/video/backlight/as3711_bl.c | 11 +- drivers/video/backlight/backlight.c | 208 +++++++++------- drivers/video/backlight/bd6107.c | 7 +- drivers/video/backlight/corgi_lcd.c | 8 +- drivers/video/backlight/cr_bllcd.c | 25 +- drivers/video/backlight/da903x_bl.c | 13 +- drivers/video/backlight/ep93xx_bl.c | 8 +- drivers/video/backlight/generic_bl.c | 110 --------- drivers/video/backlight/gpio_backlight.c | 17 +- drivers/video/backlight/hp680_bl.c | 6 +- drivers/video/backlight/jornada720_bl.c | 2 +- drivers/video/backlight/kb3886_bl.c | 6 +- drivers/video/backlight/led_bl.c | 7 +- drivers/video/backlight/lm3533_bl.c | 8 +- drivers/video/backlight/locomolcd.c | 6 +- drivers/video/backlight/lv5207lp.c | 7 +- drivers/video/backlight/max8925_bl.c | 13 +- drivers/video/backlight/pwm_bl.c | 7 +- drivers/video/backlight/qcom-wled.c | 7 +- drivers/video/backlight/tps65217_bl.c | 10 +- drivers/video/backlight/wm831x_bl.c | 13 +- include/linux/backlight.h | 399 +++++++++++++++++++++++++------ 30 files changed, 497 insertions(+), 466 deletions(-)

3 23

[bug report] drm/ingenic: Add support for the IPU
by dan.carpenter＠oracle.com 20 Jul '20

20 Jul '20

Hello Paul Cercueil, The patch fc1acf317b01: "drm/ingenic: Add support for the IPU" from Jul 16, 2020, leads to the following static checker warning: drivers/gpu/drm/ingenic/ingenic-drm-drv.c:232 ingenic_drm_crtc_atomic_check() error: potentially dereferencing uninitialized 'ipu_state'. drivers/gpu/drm/ingenic/ingenic-drm-drv.c 197 static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc, 198 struct drm_crtc_state *state) 199 { 200 struct ingenic_drm *priv = drm_crtc_get_priv(crtc); 201 struct drm_plane_state *f1_state, *f0_state, *ipu_state; 202 long rate; 203 204 if (!drm_atomic_crtc_needs_modeset(state)) 205 return 0; 206 207 if (state->mode.hdisplay > priv->soc_info->max_width || 208 state->mode.vdisplay > priv->soc_info->max_height) 209 return -EINVAL; 210 211 rate = clk_round_rate(priv->pix_clk, 212 state->adjusted_mode.clock * 1000); 213 if (rate < 0) 214 return rate; 215 216 if (priv->soc_info->has_osd) { 217 f1_state = drm_atomic_get_plane_state(state->state, &priv->f1); 218 f0_state = drm_atomic_get_plane_state(state->state, &priv->f0); 219 220 if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU) && priv->ipu_plane) { Do we need to check both the CONFIG and the priv->ipu_plane or would it be sufficient to just check if (priv->ipu_plane) {? 221 ipu_state = drm_atomic_get_plane_state(state->state, priv->ipu_plane); 222 223 /* IPU and F1 planes cannot be enabled at the same time. */ 224 if (f1_state->fb && ipu_state->fb) { 225 dev_dbg(priv->dev, "Cannot enable both F1 and IPU\n"); 226 return -EINVAL; 227 } 228 } 229 230 /* If all the planes are disabled, we won't get a VBLANK IRQ */ 231 priv->no_vblank = !f1_state->fb && !f0_state->fb && 232 !(priv->ipu_plane && ipu_state->fb); ^^^^^^^^^^^^^^^ Because here we're only checking "priv->ipu_plane". 233 } 234 235 return 0; 236 } regards, dan carpenter

4 3

[PATCH] RFC: ACPI / OSI: remove workarounds for hybrid graphics laptops
by Karol Herbst 20 Jul '20

20 Jul '20

It's hard to figure out what systems are actually affected and right now I don't see a good way of removing those... But I'd like to see thos getting removed and drivers fixed instead (which happened at least for nouveau). And as mentioned before, I prefer people working on fixing issues instead of spending time to add firmware level workarounds which are hard to know to which systems they apply to, hard to remove and basically a big huge pain to work with. In the end I have no idea how to even figure out what systems are affected and which not by this, so I have no idea how to even verify we can safely remove this (which just means those are impossible to remove unless we risk breaking systems, which again makes those supper annoying to deal with). Also from the comments it's hard to get what those bits really do. Are they just preventing runtime pm or do the devices are powered down when booting? I am sure it's the former, still... Please, don't do this again. For now, those workaround prevent power savings on systems those workaround applies to, which might be any so those should get removed asap and if new issues arrise removing those please do a proper bug report and we can look into it and come up with a proper fix (and keep this patch out until we resolve all of those). Signed-off-by: Karol Herbst <kherbst(a)redhat.com> CC: Alex Hung <alex.hung(a)canonical.com> CC: "Rafael J. Wysocki" <rjw(a)rjwysocki.net> CC: Len Brown <lenb(a)kernel.org> CC: Lyude Paul <lyude(a)redhat.com> CC: linux-kernel(a)vger.kernel.org CC: dri-devel(a)lists.freedesktop.org CC: nouveau(a)lists.freedesktop.org --- drivers/acpi/osi.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c index 9f68538091384..d4405e1ca9b97 100644 --- a/drivers/acpi/osi.c +++ b/drivers/acpi/osi.c @@ -44,30 +44,6 @@ osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { {"Processor Device", true}, {"3.0 _SCP Extensions", true}, {"Processor Aggregator Device", true}, - /* - * Linux-Dell-Video is used by BIOS to disable RTD3 for NVidia graphics - * cards as RTD3 is not supported by drivers now. Systems with NVidia - * cards will hang without RTD3 disabled. - * - * Once NVidia drivers officially support RTD3, this _OSI strings can - * be removed if both new and old graphics cards are supported. - */ - {"Linux-Dell-Video", true}, - /* - * Linux-Lenovo-NV-HDMI-Audio is used by BIOS to power on NVidia's HDMI - * audio device which is turned off for power-saving in Windows OS. - * This power management feature observed on some Lenovo Thinkpad - * systems which will not be able to output audio via HDMI without - * a BIOS workaround. - */ - {"Linux-Lenovo-NV-HDMI-Audio", true}, - /* - * Linux-HPI-Hybrid-Graphics is used by BIOS to enable dGPU to - * output video directly to external monitors on HP Inc. mobile - * workstations as Nvidia and AMD VGA drivers provide limited - * hybrid graphics supports. - */ - {"Linux-HPI-Hybrid-Graphics", true}, }; static u32 acpi_osi_handler(acpi_string interface, u32 supported) -- 2.26.2

3 5

[PATCH] drm/mxsfb: Make supported modifiers explicit
by Guido Günther 20 Jul '20

20 Jul '20

In contrast to other display controllers on imx like DCSS and ipuv3 lcdif/mxsfb does not support detiling e.g. vivante tiled layouts. Since mesa might assume otherwise make it explicit that only DRM_FORMAT_MOD_LINEAR is supported. Signed-off-by: Guido Günther <agx(a)sigxcpu.org> --- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 762379530928..fc71e7a7a02e 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -73,6 +73,11 @@ static const uint32_t mxsfb_formats[] = { DRM_FORMAT_RGB565 }; +static const uint64_t mxsfb_modifiers[] = { + DRM_FORMAT_MOD_LINEAR, + DRM_FORMAT_MOD_INVALID +}; + static struct mxsfb_drm_private * drm_pipe_to_mxsfb_drm_private(struct drm_simple_display_pipe *pipe) { @@ -334,8 +339,8 @@ static int mxsfb_load(struct drm_device *drm, unsigned long flags) } ret = drm_simple_display_pipe_init(drm, &mxsfb->pipe, &mxsfb_funcs, - mxsfb_formats, ARRAY_SIZE(mxsfb_formats), NULL, - mxsfb->connector); + mxsfb_formats, ARRAY_SIZE(mxsfb_formats), + mxsfb_modifiers, mxsfb->connector); if (ret < 0) { dev_err(drm->dev, "Cannot setup simple display pipe\n"); goto err_vblank; -- 2.23.0

4 5

Re: SM750 : from which driver should I start to add a new transmitter ?
by Sudip Mukherjee 20 Jul '20

20 Jul '20

HI Gilles, (Added fbdev and dri list) On Mon, Jul 20, 2020 at 10:18 AM Gilles Buloz <Gilles.Buloz(a)kontron.com> wrote: > > Dear developers, > > > My company is manufacturing M2 graphics modules based on SM750. and I need to add support for an ANX9404 transmitter (for DP). I'm wondering which driver you would recommend to start my development : > > - your SM750 framebuffer driver is available in the kernel under drivers/staging/sm750fb/. It is clean and maintained. Yes, and I know many companies who are using SM750 uses this driver, but the fact remains that it can be removed from staging any time as it can never migrate out of staging, > > - I'm currently using another driver from SiliconMotion I got through Innodisk (another modules manufacturer) supporting SM750/SM768 and labelled "SiliconMotion GPU DRM Driver". But the code is not very clean and produces lots of warning when building, and seems no more maintained. I even don't have the name nor the email of the developer. However it already works fine with our current HDMI transmitter. > > > Having a look to the sm750fb kernel driver, the TODO file says : "must be ported to the atomic kms framework in the drm subsystem (which will give you a basic fbdev driver for free)". Yes. > > It seems my current driver is already of this kind (DRM driver using modesetting Xorg module). I can send you the source code of this driver as it is open source If you want to see which driver I mean. Is it the same as the one I have at gitlab (https://gitlab.com/sudipm/sm750/tree/sm750) ? If it is same then it will not be accepted in drm subsystem as it needs to be cleaned and I will need to add "atomic" to it. Well, atomic was the main blocker. But, if the driver that you have has been already converted to be an atomic driver then please send it to me and I can clean it up and submit. -- Regards Sudip

1 0

[PATCH] drm/i915: Don't force IOSF_MBI
by Jisheng Zhang 20 Jul '20

20 Jul '20

The i915 doesn't depend on IOSF_MBI, asm/iosf_mbi.h already defines isof_mbi_* APIs when ISOF_MBI is disabled. Don't force IOSF_MBI to allow disabling IOSF_MBI for non SoC platforms. Signed-off-by: Jisheng Zhang <Jisheng.Zhang(a)synaptics.com> --- drivers/gpu/drm/i915/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 9afa5c4a6bf0..b76874989292 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -21,7 +21,6 @@ config DRM_I915 select ACPI_VIDEO if ACPI select ACPI_BUTTON if ACPI select SYNC_FILE - select IOSF_MBI select CRC32 select SND_HDA_I915 if SND_HDA_CORE select CEC_CORE if CEC_NOTIFIER -- 2.28.0.rc0

2 2

[PATCH] drm/mxsfb: drop unused function parameter
by Uwe Kleine-König 20 Jul '20

20 Jul '20

flags is unused since the driver was introduced in commit 45d59d704080 ("drm: Add new driver for MXSFB controller"). Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> --- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 497cf443a9af..fb972dd4f642 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -191,7 +191,7 @@ static struct drm_simple_display_pipe_funcs mxsfb_funcs = { .disable_vblank = mxsfb_pipe_disable_vblank, }; -static int mxsfb_load(struct drm_device *drm, unsigned long flags) +static int mxsfb_load(struct drm_device *drm) { struct platform_device *pdev = to_platform_device(drm->dev); struct mxsfb_drm_private *mxsfb; @@ -407,7 +407,7 @@ static int mxsfb_probe(struct platform_device *pdev) if (IS_ERR(drm)) return PTR_ERR(drm); - ret = mxsfb_load(drm, 0); + ret = mxsfb_load(drm); if (ret) goto err_free; -- 2.27.0

2 1

[PATCH] drm/mxsfb: miss err handle in probe
by Bernard Zhao 20 Jul '20

20 Jul '20

There are three err return values in drm_fbdev_generic_setup. In mxsfb_probe we called this function, but didn`t handle the return value, this change is to add err handle, maybe make code a bit more readable. Signed-off-by: Bernard Zhao <bernard(a)vivo.com> --- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 497cf443a9af..a45f3b85f725 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -415,7 +415,9 @@ static int mxsfb_probe(struct platform_device *pdev) if (ret) goto err_unload; - drm_fbdev_generic_setup(drm, 32); + ret = drm_fbdev_generic_setup(drm, 32); + if (ret) + goto err_unload; return 0; -- 2.17.1

2 1

← Newer
1
...
42
43
44
45
46
47
48
...
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