dri-devel February 2019

dri-devel@lists.freedesktop.org

256 participants
1976 discussions

[PATCH] drm/vc4: Use struct_size() in kzalloc()
by Gustavo A. R. Silva 07 Feb '19

07 Feb '19

One of the more common cases of allocation size calculations is finding the size of a structure that has a zero-sized array at the end, along with memory for some number of elements for that array. For example: struct foo { int stuff; void *entry[]; }; instance = kzalloc(sizeof(struct foo) + count * sizeof(struct boo), GFP_KERNEL); Instead of leaving these open-coded and prone to type mistakes, we can now use the new struct_size() helper: instance = kzalloc(struct_size(instance, entry, count), GFP_KERNEL); This code was detected with the help of Coccinelle. Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- drivers/gpu/drm/vc4/vc4_perfmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c index 437e7a27f21d..495150415020 100644 --- a/drivers/gpu/drm/vc4/vc4_perfmon.c +++ b/drivers/gpu/drm/vc4/vc4_perfmon.c @@ -117,7 +117,7 @@ int vc4_perfmon_create_ioctl(struct drm_device *dev, void *data, return -EINVAL; } - perfmon = kzalloc(sizeof(*perfmon) + (req->ncounters * sizeof(u64)), + perfmon = kzalloc(struct_size(perfmon, counters, req->ncounters), GFP_KERNEL); if (!perfmon) return -ENOMEM; -- 2.20.1

2 2

[PATCH v10 00/40] drm/i915: Implement HDCP2.2
by Ramalingam C 07 Feb '19

07 Feb '19

This series enables the HDCP2.2 Type 0 for I915. The sequence for HDCP2.2 authentication and encryption is implemented as a generic flow between HDMI and DP. Encoder specific implementations are moved into hdcp_shim. Intel HWs supports HDCP2.2 through ME FW. Hence this series introduces a client driver for mei bus, so that for HDCP2.2 authentication, HDCP2.2 stack in I915 can avail the services from ME FW. To enable this client driver set the config variable CONFIG_INTEL_MEI_HDCP. Userspace interface remains unchanged as version agnostic. When userspace request for HDCP enable, Kernel will detect the HDCP source and sink's HDCP version(1.4/2.2)capability and enable the best capable version for that combination. This series enables the HDCP2.2 for Type0 content streams. Major changes in v10: - I915-MEI interface is implemented with component framework. - I915 detects the mei_hdcp device availability to enabled HDCP2.2. Hopefully we are near the end of this series. To ease the review process, series is hosted at https://github.com/ramalingampc2008/drm-tip.git hdcp2_2_v10 Daniel Vetter (2): components: multiple components for a device i915/snd_hdac: I915 subcomponent for the snd_hdac Ramalingam C (36): drm/i915: Gathering the HDCP1.4 routines together drm: header for i915 - MEI_HDCP interface drm/i915: Initialize HDCP2.2 drm/i915: MEI interface definition drm/i915: hdcp1.4 CP_IRQ handling and SW encryption tracking drm/i915: Enable and Disable of HDCP2.2 drm/i915: Implement HDCP2.2 receiver authentication drm: helper functions for hdcp2 seq_num to from u32 drm/i915: Implement HDCP2.2 repeater authentication drm: HDCP2.2 link check period drm/i915: Implement HDCP2.2 link integrity check drm/i915: Handle HDCP2.2 downstream topology change drm: removing the DP Errata msg and its msg id drm/i915: Implement the HDCP2.2 support for DP drm/i915: Implement the HDCP2.2 support for HDMI drm/i915: CP_IRQ handling for DP HDCP2.2 msgs drm/i915: Add HDCP2.2 support for DP connectors drm/i915: Add HDCP2.2 support for HDMI connectors misc/mei/hdcp: Client driver for HDCP application misc/mei/hdcp: Define ME FW interface for HDCP2.2 misc/mei/hdcp: Initiate Wired HDCP2.2 Tx Session misc/mei/hdcp: Verify Receiver Cert and prepare km misc/mei/hdcp: Verify H_prime misc/mei/hdcp: Store the HDCP Pairing info misc/mei/hdcp: Initiate Locality check misc/mei/hdcp: Verify L_prime misc/mei/hdcp: Prepare Session Key misc/mei/hdcp: Repeater topology verification and ack misc/mei/hdcp: Verify M_prime misc/mei/hdcp: Enabling the HDCP authentication misc/mei/hdcp: Closing wired HDCP2.2 Tx Session misc/mei/hdcp: Component framework for I915 Interface drm/i915: Commit CP without modeset drm/i915: Fix KBL HDCP2.2 encrypt status signalling FOR_TEST: i915/Kconfig: Select mei_hdcp by I915 FOR_TESTING_ONLY: debugfs: Excluding the LSPCon for HDCP1.4 Tomas Winkler (2): mei: bus: whitelist hdcp client mei: bus: export to_mei_cl_device for mei client device drivers drivers/base/component.c | 67 +- drivers/gpu/drm/i915/i915_debugfs.c | 10 +- drivers/gpu/drm/i915/i915_drv.c | 1 + drivers/gpu/drm/i915/i915_drv.h | 7 + drivers/gpu/drm/i915/intel_audio.c | 4 +- drivers/gpu/drm/i915/intel_ddi.c | 7 - drivers/gpu/drm/i915/intel_display.c | 10 + drivers/gpu/drm/i915/intel_dp.c | 355 +++++++++- drivers/gpu/drm/i915/intel_drv.h | 88 ++- drivers/gpu/drm/i915/intel_hdcp.c | 1248 ++++++++++++++++++++++++++++++--- drivers/gpu/drm/i915/intel_hdmi.c | 240 ++++++- drivers/misc/mei/Kconfig | 8 + drivers/misc/mei/Makefile | 2 + drivers/misc/mei/bus-fixup.c | 16 + drivers/misc/mei/bus.c | 1 - drivers/misc/mei/hdcp/Makefile | 7 + drivers/misc/mei/hdcp/mei_hdcp.c | 835 ++++++++++++++++++++++ drivers/misc/mei/hdcp/mei_hdcp.h | 399 +++++++++++ include/drm/drm_hdcp.h | 25 +- include/drm/i915_component.h | 7 + include/drm/i915_mei_hdcp_interface.h | 148 ++++ include/linux/component.h | 5 + include/linux/mei_cl_bus.h | 2 + include/sound/hda_component.h | 5 +- sound/hda/hdac_component.c | 4 +- sound/hda/hdac_i915.c | 6 +- 26 files changed, 3352 insertions(+), 155 deletions(-) create mode 100644 drivers/misc/mei/hdcp/Makefile create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.c create mode 100644 drivers/misc/mei/hdcp/mei_hdcp.h create mode 100644 include/drm/i915_mei_hdcp_interface.h -- 2.7.4

10 115

[PATCH 0/6] drm/drv: Remove drm_dev_unplug()
by Noralf Trønnes 07 Feb '19

07 Feb '19

This series removes drm_dev_unplug() and moves the unplugged state setting to drm_dev_unregister(). All drivers will now have access to the unplugged state if they so desire. The drm_device ref handling wrt to the last fd closed after unregister have been simplified, which also fixed a double drm_dev_unregister() situation. Noralf. Noralf Trønnes (6): drm: Fix drm_release() and device unplug drm/drv: Prepare to remove drm_dev_unplug() drm/amd: Use drm_dev_unregister() drm/udl: Use drm_dev_unregister() drm/xen: Use drm_dev_unregister() drm/drv: Remove drm_dev_unplug() drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +- drivers/gpu/drm/drm_drv.c | 48 ++++++++----------------- drivers/gpu/drm/drm_file.c | 6 ++-- drivers/gpu/drm/udl/udl_drv.c | 3 +- drivers/gpu/drm/xen/xen_drm_front.c | 7 ++-- include/drm/drm_drv.h | 11 +++--- 6 files changed, 27 insertions(+), 51 deletions(-) -- 2.20.1

6 28

[PATCH v6 0/5] drm: minimize drmP.h dependencies
by Sam Ravnborg 07 Feb '19

07 Feb '19

Updated patchset, with merged patches removed, new patches added. > From the original mail: - drmP.h is now stripped down to include files and forward declarations. - All header files in include/drm/ no longer include drmP.h. The series was made on top of drm-misc-next: f1a2a540c86441016ce3dff6590b7a09080871de ("video/hdmi: Add an enum for HDMI packet types") Build tested using arm and x86, ia64, alpha, sparc32, sparc64 Included staging/vboxvideo in the build test - which revealed the build issues Daniel had identifed This series include fixes to i915 as it looks in drm-misc. This series also include fixes to stagin/vboxvideo, which I expect to be committet to drm-misc due to the final patch (drmP.h removal from drm_modeset_helper.h) depending on this patch. Daniel - thanks for being paitent and applying this piecemal. Sam v6: - include fixes to vboxvideo (Daniel) - include i915 build fixes - revised/new rcar-du patch (lots of new build failures popped up) - split updates to drm/*.c file to dedicated patch, to make the final removal patch slimmer v5: - Rebased on top of drm-misc-next and dropped patches already merged - Sorted list of include files where they are touched (Laurent) - Collected ack's, reviewed by's v4: - Rebased on top of drm-misc-next and dropped patches already merged - Include build test of kirin (Daniel) - Plug drm_util.h into drm-internals.rst (Daniel) - Fix kernel-doc syntax in drm_util.h (Daniel) - Split removal of drmP.h from drm_modeset_helper.h in smaller patches, to ease the merge process v3: - Added Acks/Reviewed annotations (thanks!) - Add forward of drm_gem_object to drm_framebuffer.h (Noralf) - Drop "drm: move DRM_IF_VERSION to drm_internal.h" as it is applied to drm-misc - Drop "drm: make drm_file.h self contained" as Jan made a similar patch that was appleid to drm-misc - Rebased on top of drm-misc-next v2: - DRM_SWITCH_POWER as enum (Daniel Vetter) - Prefer forward decalration over includes (Laurent Pinchart) - Updated drm_device to use kerneldoc style (Daniel Vetter) - Improved commit messages (David Lechner) - Split up patch when removing drmP.h from drm_gem_cma_helper.h - rebased on top of drm-misc-next - dropped patch already applied - added reviewed-by from Laurent Pinchart (Laurent Pinchart) - add drm_framebuffer.h patch - add kernel-doc comments to drm_util.h - moved EXPORT_SYMBOL_FOR_TESTS_ONLY to drm_util.h - added note to drmP.h not to add new stuff and not to use in new files Sam Ravnborg (5): staging/vboxvideo: prepare for drmP.h removal from drm_modeset_helper.h drm/i915: prepare for drmP.h removal from drm_modeset_helper.h drm/rcar-du: prepare for drmP.h removal from drm_modeset_helper.h drm: prepare for drmP.h removal from drm_modeset_helper.h drm: remove drmP.h from drm_modeset_helper.h drivers/gpu/drm/drm_damage_helper.c | 1 + drivers/gpu/drm/drm_modeset_helper.c | 2 ++ drivers/gpu/drm/i915/i915_drv.c | 4 +++- drivers/gpu/drm/i915/intel_atomic.c | 2 ++ drivers/gpu/drm/i915/intel_atomic_plane.c | 2 ++ drivers/gpu/drm/i915/intel_display.c | 29 ++++++++++++++++------------- drivers/gpu/drm/i915/intel_pm.c | 7 +++++-- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 3 +++ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 1 + drivers/staging/vboxvideo/vbox_drv.c | 6 +++++- drivers/staging/vboxvideo/vbox_fb.c | 18 ++++++++++-------- drivers/staging/vboxvideo/vbox_mode.c | 5 ++++- include/drm/drm_modeset_helper.h | 6 +++++- 16 files changed, 64 insertions(+), 27 deletions(-)

4 9

[PATCH] drm/dp_mst: Remove rebase-detritus in VCPI helper kernel-docs
by Lyude Paul 07 Feb '19

07 Feb '19

Looks like when making the final revision of: 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") I forgot to remove some of the comments that I had added to drm_dp_atomic_find_vcpi_slots() and drm_dp_atomic_release_vcpi_slots() that were no longer valid due to us having removed the state->duplicated checks from each function. This also introduced an error while building the docs with sphinx: ./drivers/gpu/drm/drm_dp_mst_topology.c:3100: WARNING: Inline literal start-string without end-string. So, fix that by just removing the kerneldoc comments. Signed-off-by: Lyude Paul <lyude(a)redhat.com> Fixes: 022debad063e ("drm/atomic: Add drm_atomic_state->duplicated") Cc: Daniel Vetter <daniel(a)ffwll.ch> --- drivers/gpu/drm/drm_dp_mst_topology.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 5a99135d39cd..dc7ac0c60547 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -3097,10 +3097,6 @@ static int drm_dp_init_vcpi(struct drm_dp_mst_topology_mgr *mgr, * @port as needed. It is not OK however, to call this function and * drm_dp_atomic_release_vcpi_slots() in the same atomic check phase. * - * When &drm_atomic_state.duplicated is set to %true%, this function will not - * perform any error checking and will instead simply return the previously - * recorded VCPI allocations. - * * See also: * drm_dp_atomic_release_vcpi_slots() * drm_dp_mst_atomic_check() @@ -3185,11 +3181,6 @@ EXPORT_SYMBOL(drm_dp_atomic_find_vcpi_slots); * drm_dp_atomic_find_vcpi_slots() on the same @port in a single atomic check * phase. * - * When &drm_atomic_state.duplicated is set, this function will not - * modify the VCPI allocations in &drm_dp_mst_topology_state.vcpis, so that - * those VCPI allocations may be restored as-is from the duplicated state. In - * this scenario, this function will always return 0. - * * See also: * drm_dp_atomic_find_vcpi_slots() * drm_dp_mst_atomic_check() -- 2.20.1

2 1

[PATCH] drm: enable uncached DMA optimization for ARM and arm64
by Ard Biesheuvel 07 Feb '19

07 Feb '19

The DRM driver stack is designed to work with cache coherent devices only, but permits an optimization to be enabled in some cases, where for some buffers, both the CPU and the GPU use uncached mappings, removing the need for DMA snooping and allocation in the CPU caches. The use of uncached GPU mappings relies on the correct implementation of the PCIe NoSnoop TLP attribute by the platform, otherwise the GPU will use cached mappings nonetheless. On x86 platforms, this does not seem to matter, as uncached CPU mappings will snoop the caches in any case. However, on ARM and arm64, enabling this optimization on a platform where NoSnoop is ignored results in loss of coherency, which breaks correct operation of the device. Since we have no way of detecting whether NoSnoop works or not, just disable this optimization entirely for ARM and arm64. Cc: Christian Koenig <christian.koenig(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: David Zhou <David1.Zhou(a)amd.com> Cc: Huang Rui <ray.huang(a)amd.com> Cc: Junwei Zhang <Jerry.Zhang(a)amd.com> Cc: Michel Daenzer <michel.daenzer(a)amd.com> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> Cc: Maxime Ripard <maxime.ripard(a)bootlin.com> Cc: Sean Paul <sean(a)poorly.run> Cc: Michael Ellerman <mpe(a)ellerman.id.au> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Christoph Hellwig <hch(a)infradead.org> Cc: Robin Murphy <robin.murphy(a)arm.com> Cc: amd-gfx list <amd-gfx(a)lists.freedesktop.org> Cc: dri-devel <dri-devel(a)lists.freedesktop.org> Reported-by: Carsten Haitzler <Carsten.Haitzler(a)arm.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> --- include/drm/drm_cache.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/drm/drm_cache.h b/include/drm/drm_cache.h index bfe1639df02d..97fc498dc767 100644 --- a/include/drm/drm_cache.h +++ b/include/drm/drm_cache.h @@ -47,6 +47,24 @@ static inline bool drm_arch_can_wc_memory(void) return false; #elif defined(CONFIG_MIPS) && defined(CONFIG_CPU_LOONGSON3) return false; +#elif defined(CONFIG_ARM) || defined(CONFIG_ARM64) + /* + * The DRM driver stack is designed to work with cache coherent devices + * only, but permits an optimization to be enabled in some cases, where + * for some buffers, both the CPU and the GPU use uncached mappings, + * removing the need for DMA snooping and allocation in the CPU caches. + * + * The use of uncached GPU mappings relies on the correct implementation + * of the PCIe NoSnoop TLP attribute by the platform, otherwise the GPU + * will use cached mappings nonetheless. On x86 platforms, this does not + * seem to matter, as uncached CPU mappings will snoop the caches in any + * case. However, on ARM and arm64, enabling this optimization on a + * platform where NoSnoop is ignored results in loss of coherency, which + * breaks correct operation of the device. Since we have no way of + * detecting whether NoSnoop works or not, just disable this + * optimization entirely for ARM and arm64. + */ + return false; #else return true; #endif -- 2.20.1

4 11

[PATCH] drm/omap: dsi: Fix PM for display blank with paired dss_pll calls
by Tony Lindgren 07 Feb '19

07 Feb '19

Currently dsi_display_init_dsi() calls dss_pll_enable() but it is not paired with dss_pll_disable() in dsi_display_uninit_dsi(). This leaves the DSS clocks enabled when the display is blanked wasting about extra 5mW of power while idle. Let's fix this by setting a dsi->disconnect_lanes flag and making the current dsi_pll_uninit() into dsi_pll_disable(). This way we can just call dss_pll_disable() from dsi_display_uninit_dsi() and the code becomes a bit easier to follow. Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- drivers/gpu/drm/omapdrm/dss/dsi.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -339,6 +339,7 @@ struct dsi_data { int irq; bool is_enabled; + unsigned int disconnect_lanes:1; struct clk *dss_clk; struct regmap *syscon; @@ -1382,10 +1383,12 @@ static int dsi_pll_enable(struct dss_pll *pll) return r; } -static void dsi_pll_uninit(struct dsi_data *dsi, bool disconnect_lanes) +static void dsi_pll_disable(struct dss_pll *pll) { + struct dsi_data *dsi = container_of(pll, struct dsi_data, pll); + dsi_pll_power(dsi, DSI_PLL_POWER_OFF); - if (disconnect_lanes) { + if (dsi->disconnect_lanes) { WARN_ON(!dsi->vdds_dsi_enabled); regulator_disable(dsi->vdds_dsi_reg); dsi->vdds_dsi_enabled = false; @@ -1397,13 +1400,6 @@ static void dsi_pll_uninit(struct dsi_data *dsi, bool disconnect_lanes) DSSDBG("PLL uninit done\n"); } -static void dsi_pll_disable(struct dss_pll *pll) -{ - struct dsi_data *dsi = container_of(pll, struct dsi_data, pll); - - dsi_pll_uninit(dsi, true); -} - static int dsi_dump_dsi_clocks(struct seq_file *s, void *p) { struct dsi_data *dsi = p; @@ -4158,7 +4154,9 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes, dss_select_dsi_clk_source(dsi->dss, dsi->module_id, DSS_CLK_SRC_FCK); dsi_cio_uninit(dsi); - dsi_pll_uninit(dsi, disconnect_lanes); + + dsi->disconnect_lanes = disconnect_lanes; + dss_pll_disable(&dsi->pll); } static int dsi_display_enable(struct omap_dss_device *dssdev) -- 2.20.1

2 10

Re: [Linaro-mm-sig] [PATCH 2/4] staging: android: ion: Restrict cache maintenance to dma mapped memory
by Ørjan Eide 07 Feb '19

07 Feb '19

On Wed, Feb 06, 2019 at 11:31:04PM -0800, Christoph Hellwig wrote: > The CPU may only access DMA mapped memory if ownership has been > transferred back to the CPU using dma_sync_{single,sg}_to_cpu, and then > before the device can access it again ownership needs to be transferred > back to the device using dma_sync_{single,sg}_to_device. > > > I've run some testing, and this patch does indeed fix the crash in > > dma_sync_sg_for_cpu when it tried to use the 0 dma_address from the sg > > list. > > > > Tested-by: Ørjan Eide <orjan.eide(a)arm.com> > > > > I tested this on an older kernel, v4.14, since the dma-mapping code > > moved, in v4.19, to ignore the dma_address and instead use sg_phys() to > > get a valid address from the page, which is always valid in the ion sg > > lists. While this wouldn't crash on newer kernels, it's still good to > > avoid the unnecessary work when no CMO is needed. > > Can you also test is with CONFIG_DMA_API_DEBUG enabled, as that should > catch all the usual mistakes in DMA API usage, including the one found? I checked again with CONFIG_DMA_API_DEBUG=y, both with and without this patch, and I didn't get any dma-mapping errors. The issue I hit, without this patch, is when a CPU access starts after a device have attached, which caused ion to create a copy of the buffer's sg list with dma_address zeroed, but before the device have mapped the buffer. -- Ørjan

1 0

[PATCH 0/4] drm/sun4i: dsi: Add burst mode support
by Maxime Ripard 07 Feb '19

07 Feb '19

Hi, Here is a series implementing the burst mode support for DSI. It's been tested on an A33 board with the panel supported on the 4th patch, which should remove all quirks due to a different SoC from the equation. Let me know what you think, Maxime Konstantin Sudakov (2): drm/sun4i: dsi: Add burst support drm/panel: Add Rondo RB070D30 panel Maxime Ripard (2): drm/sun4i: dsi: Restrict DSI tcon clock divider drm/sun4i: dsi: Change the start delay calculation drivers/gpu/drm/panel/Kconfig | 9 +- drivers/gpu/drm/panel/Makefile | 1 +- drivers/gpu/drm/panel/panel-rondo-rb070d30.c | 258 ++++++++++++++++++++- drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 185 ++++++++++---- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 2 +- 6 files changed, 414 insertions(+), 45 deletions(-) create mode 100644 drivers/gpu/drm/panel/panel-rondo-rb070d30.c base-commit: f6028e7e48b0f3865b0837d400ca783d3d200b62 -- git-series 0.9.1

6 19

[PATCH] drm: Nuke drm_calc_{h,v}scale_relaxed()
by Ville Syrjala 07 Feb '19

07 Feb '19

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> The fuzzy drm_calc_{h,v}scale_relaxed() helpers are no longer used. Throw them in the bin. Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/drm_rect.c | 108 ------------------------------------- include/drm/drm_rect.h | 6 --- 2 files changed, 114 deletions(-) diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c index 8c057829b804..66c41b12719c 100644 --- a/drivers/gpu/drm/drm_rect.c +++ b/drivers/gpu/drm/drm_rect.c @@ -207,114 +207,6 @@ int drm_rect_calc_vscale(const struct drm_rect *src, } EXPORT_SYMBOL(drm_rect_calc_vscale); -/** - * drm_calc_hscale_relaxed - calculate the horizontal scaling factor - * @src: source window rectangle - * @dst: destination window rectangle - * @min_hscale: minimum allowed horizontal scaling factor - * @max_hscale: maximum allowed horizontal scaling factor - * - * Calculate the horizontal scaling factor as - * (@src width) / (@dst width). - * - * If the calculated scaling factor is below @min_vscale, - * decrease the height of rectangle @dst to compensate. - * - * If the calculated scaling factor is above @max_vscale, - * decrease the height of rectangle @src to compensate. - * - * If the scale is below 1 << 16, round down. If the scale is above - * 1 << 16, round up. This will calculate the scale with the most - * pessimistic limit calculation. - * - * RETURNS: - * The horizontal scaling factor. - */ -int drm_rect_calc_hscale_relaxed(struct drm_rect *src, - struct drm_rect *dst, - int min_hscale, int max_hscale) -{ - int src_w = drm_rect_width(src); - int dst_w = drm_rect_width(dst); - int hscale = drm_calc_scale(src_w, dst_w); - - if (hscale < 0 || dst_w == 0) - return hscale; - - if (hscale < min_hscale) { - int max_dst_w = src_w / min_hscale; - - drm_rect_adjust_size(dst, max_dst_w - dst_w, 0); - - return min_hscale; - } - - if (hscale > max_hscale) { - int max_src_w = dst_w * max_hscale; - - drm_rect_adjust_size(src, max_src_w - src_w, 0); - - return max_hscale; - } - - return hscale; -} -EXPORT_SYMBOL(drm_rect_calc_hscale_relaxed); - -/** - * drm_rect_calc_vscale_relaxed - calculate the vertical scaling factor - * @src: source window rectangle - * @dst: destination window rectangle - * @min_vscale: minimum allowed vertical scaling factor - * @max_vscale: maximum allowed vertical scaling factor - * - * Calculate the vertical scaling factor as - * (@src height) / (@dst height). - * - * If the calculated scaling factor is below @min_vscale, - * decrease the height of rectangle @dst to compensate. - * - * If the calculated scaling factor is above @max_vscale, - * decrease the height of rectangle @src to compensate. - * - * If the scale is below 1 << 16, round down. If the scale is above - * 1 << 16, round up. This will calculate the scale with the most - * pessimistic limit calculation. - * - * RETURNS: - * The vertical scaling factor. - */ -int drm_rect_calc_vscale_relaxed(struct drm_rect *src, - struct drm_rect *dst, - int min_vscale, int max_vscale) -{ - int src_h = drm_rect_height(src); - int dst_h = drm_rect_height(dst); - int vscale = drm_calc_scale(src_h, dst_h); - - if (vscale < 0 || dst_h == 0) - return vscale; - - if (vscale < min_vscale) { - int max_dst_h = src_h / min_vscale; - - drm_rect_adjust_size(dst, 0, max_dst_h - dst_h); - - return min_vscale; - } - - if (vscale > max_vscale) { - int max_src_h = dst_h * max_vscale; - - drm_rect_adjust_size(src, 0, max_src_h - src_h); - - return max_vscale; - } - - return vscale; -} -EXPORT_SYMBOL(drm_rect_calc_vscale_relaxed); - /** * drm_rect_debug_print - print the rectangle information * @prefix: prefix string diff --git a/include/drm/drm_rect.h b/include/drm/drm_rect.h index 6c54544a4be7..6195820aa5c5 100644 --- a/include/drm/drm_rect.h +++ b/include/drm/drm_rect.h @@ -182,12 +182,6 @@ int drm_rect_calc_hscale(const struct drm_rect *src, int drm_rect_calc_vscale(const struct drm_rect *src, const struct drm_rect *dst, int min_vscale, int max_vscale); -int drm_rect_calc_hscale_relaxed(struct drm_rect *src, - struct drm_rect *dst, - int min_hscale, int max_hscale); -int drm_rect_calc_vscale_relaxed(struct drm_rect *src, - struct drm_rect *dst, - int min_vscale, int max_vscale); void drm_rect_debug_print(const char *prefix, const struct drm_rect *r, bool fixed_point); void drm_rect_rotate(struct drm_rect *r, -- 2.19.2

3 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2019