dri-devel January 2018

dri-devel@lists.freedesktop.org

226 participants
1677 discussions

[PULL] drm-intel-fixes
by Jani Nikula 04 Jan '18

04 Jan '18

Hi Dave, some more i915 fixes for the new year. drm-intel-fixes-2018-01-04: drm/i915 fixes for v4.15-rc7 - couple of documentation build fixes - serialize non-blocking modesets - prevent DMC from messing up GMBUS transfers - PSR regression fix BR, Jani. The following changes since commit 30a7acd573899fd8b8ac39236eff6468b195ac7d: Linux 4.15-rc6 (2017-12-31 14:47:43 -0800) are available in the git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-fixes-2018-01-04 for you to fetch changes up to 30414f3010aff95ffdb6bed7b9dce62cde94fdc7: drm/i915: Apply Display WA #1183 on skl, kbl, and cfl (2018-01-04 14:39:08 +0200) ---------------------------------------------------------------- drm/i915 fixes for v4.15-rc7 - couple of documentation build fixes - serialize non-blocking modesets - prevent DMC from messing up GMBUS transfers - PSR regression fix ---------------------------------------------------------------- Dhinakaran Pandiyan (1): drm/i915/psr: Fix register name mess up. Lucas De Marchi (1): drm/i915: Apply Display WA #1183 on skl, kbl, and cfl Markus Heiser (1): docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c Randy Dunlap (1): documentation/gpu/i915: fix docs build error after file rename Ville Syrjälä (2): drm/i915: Disable DC states around GMBUS on GLK drm/i915: Put all non-blocking modesets onto an ordered wq Documentation/gpu/i915.rst | 5 +---- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 2 ++ drivers/gpu/drm/i915/intel_cdclk.c | 35 ++++++++++++++++++++++++--------- drivers/gpu/drm/i915/intel_display.c | 14 ++++++++++--- drivers/gpu/drm/i915/intel_psr.c | 16 +++++++-------- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++++++++ 7 files changed, 62 insertions(+), 24 deletions(-) -- Jani Nikula, Intel Open Source Technology Center

1 0

[PATCH] fbdev: auo_k190x: Use zeroing memory allocator than allocator/memset
by Himanshu Jha 04 Jan '18

04 Jan '18

Use vzalloc for allocating zeroed memory and remove unnecessary memset function. Done using Coccinelle. Generated-by: scripts/coccinelle/api/alloc/kzalloc-simple.cocci 0-day tested with no failures. Suggested-by: Luis R. Rodriguez <mcgrof(a)kernel.org> Signed-off-by: Himanshu Jha <himanshujha199640(a)gmail.com> --- drivers/video/fbdev/auo_k190x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/video/fbdev/auo_k190x.c b/drivers/video/fbdev/auo_k190x.c index 0d060383..b889401 100644 --- a/drivers/video/fbdev/auo_k190x.c +++ b/drivers/video/fbdev/auo_k190x.c @@ -1056,13 +1056,12 @@ int auok190x_common_probe(struct platform_device *pdev, /* videomemory handling */ videomemorysize = roundup((panel->w * panel->h) * 2, PAGE_SIZE); - videomemory = vmalloc(videomemorysize); + videomemory = vzalloc(videomemorysize); if (!videomemory) { ret = -ENOMEM; goto err_irq; } - memset(videomemory, 0, videomemorysize); info->screen_base = (char *)videomemory; info->fix.smem_len = videomemorysize; -- 2.7.4

2 1

[PATCH v2 00/12] drm/sun4i: Support the Display Engine frontend
by Maxime Ripard 04 Jan '18

04 Jan '18

Hi, This is a first serie to enable the display engine frontend. This hardware block is found in the first generation Display Engine from Allwinner. Its role is to implement more advanced features that the associated backend, even though the backend alone can be used (and was used so far) for basic composition. Among those features, we will find hardware scaling, that is supported in this serie, colorspace conversions, or more exotic formats support such as the one output by the VPU. Let me know what you think, Maxime Changes from v1: - Fixed the unbind function to not disable the already disabled clocks, and to remove ourself from the frontend list - Changed the log level of the frontend disabled message - Added blank lines where suggested by Neil - Fixed an artifact that was happening when the plane using the frontend was disabled. This was happening because the frontend was disabled before the backend layer (that would be disabled at the next vblank). This led to a significant rework of the patches, so I didn't apply all the tags. I also had to take a few patches in. - Added engine ops documentation - Fixed a bug in our duplicate_state callback that wouldn't preserve the frontend state - Removed the hardcoded register values and used the real ones instead. - Fixed some compilation errors reported by the 0-day bot. Maxime Ripard (12): drm/sun4i: backend: Move line stride setup to buffer setup function sun4i/drm: backend: Document the engine operations drm/sun4i: backend: Add a custom plane state drm/sun4i: engine: Add a custom crtc atomic_check drm/sun4i: engine: Add a VBLANK quirk callback drm/sun4i: engine: Create an atomic_begin callback drm/sun4i: Add a driver for the display frontend drm/sun4i: backend: Wire in the frontend drm/sun4i: backend: Add a custom atomic_check for the frontend drm/sun4i: backend: Use runtime_pm variant of atomic_commit_tail drm/sun4i: backend: Make sure we don't have a commit pending ARM: dts: sun8i: a33 Enable our display frontend arch/arm/boot/dts/sun8i-a33.dtsi | 1 +- drivers/gpu/drm/sun4i/Makefile | 3 +- drivers/gpu/drm/sun4i/sun4i_backend.c | 183 ++++++++++- drivers/gpu/drm/sun4i/sun4i_backend.h | 10 +- drivers/gpu/drm/sun4i/sun4i_crtc.c | 21 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 16 +- drivers/gpu/drm/sun4i/sun4i_drv.h | 1 +- drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 6 +- drivers/gpu/drm/sun4i/sun4i_frontend.c | 392 +++++++++++++++++++++++- drivers/gpu/drm/sun4i/sun4i_frontend.h | 96 ++++++- drivers/gpu/drm/sun4i/sun4i_layer.c | 83 ++++- drivers/gpu/drm/sun4i/sun4i_layer.h | 11 +- drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 +- drivers/gpu/drm/sun4i/sunxi_engine.h | 93 ++++- 14 files changed, 897 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.c create mode 100644 drivers/gpu/drm/sun4i/sun4i_frontend.h base-commit: 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 -- git-series 0.9.1

2 24

[PATCH] fbdev: arm64 use __raw I/O memory api
by Ji Zhang 04 Jan '18

04 Jan '18

Since arm64 also has __raw I/O accessors, add __aarch64__ in fb.h. This is a supplement for commmit 981409b25e2a99409b26daa67293ca1cfd5ea0a0 Signed-off-by: Ji Zhang <ji.zhang(a)mediatek.com> --- include/linux/fb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index bc24e48..cea8a2c 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -564,7 +564,10 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) { #define fb_memcpy_fromfb sbus_memcpy_fromio #define fb_memcpy_tofb sbus_memcpy_toio -#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) || defined(__arm__) +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || \ + defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \ + defined(__avr32__) || defined(__bfin__) || defined(__arm__) || \ + defined(__aarch64__) #define fb_readb __raw_readb #define fb_readw __raw_readw -- 1.9.1

2 1

[PATCH] video: fbdev: omap2: Use PTR_ERR_OR_ZERO()
by Vasyl Gomonovych 04 Jan '18

04 Jan '18

Fix ptr_ret.cocci warnings: drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c:676:1-3: WARNING: PTR_ERR_OR_ZERO can be used Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: scripts/coccinelle/api/ptr_ret.cocci Signed-off-by: Vasyl Gomonovych <gomonovych(a)gmail.com> --- drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c index ec78d61bc551..28de56e21c74 100644 --- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c +++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c @@ -673,10 +673,7 @@ static int hdmi_audio_register(struct device *dev) dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO, &pdata, sizeof(pdata)); - if (IS_ERR(hdmi.audio_pdev)) - return PTR_ERR(hdmi.audio_pdev); - - return 0; + return PTR_ERR_OR_ZERO(hdmi.audio_pdev); } /* HDMI HW IP initialisation */ -- 1.9.1

2 1

[PATCH v3 00/11] Allwinner H3/H5/A64(DE2) SimpleFB support
by Icenowy Zheng 04 Jan '18

04 Jan '18

This patchset adds support for the SimpleFB on Allwinner SoCs with "Display Engine 2.0". PATCH 1 to PATCH 3 are DE2 CCU fixes for H3/H5 SoCs. PATCH 4 adds the pipeline strings for DE2 SimpleFB. PATCH 5 to 7 adds necessary device tree nodes (DE2 CCU and SimpleFB) for H3/H5 SoCs. PATCH 8 to 11 are for Allwinner A64 SoC to enable SimpleFB. Icenowy Zheng (11): dt-bindings: fix the binding of Allwinner DE2 CCU of A83T and H3 clk: sunxi-ng: add support for Allwinner H3 DE2 CCU clk: sunxi-ng: fix the A64/H5 clock description of DE2 CCU dt-bindings: simplefb-sunxi: add pipelines for DE2 ARM: sun8i: h3/h5: add DE2 CCU device node for H3 arm64: allwinner: h5: add compatible string for DE2 CCU ARM: sunxi: h3/h5: add simplefb nodes dt-bindings: add binding for A64 DE2 CCU SRAM clk: sunxi-ng: add support for Allwinner A64 DE2 CCU arm64: allwinner: a64: add DE2 CCU for A64 SoC arm64: allwinner: a64: add simplefb for A64 SoC .../devicetree/bindings/clock/sun8i-de2.txt | 10 ++- .../bindings/display/simple-framebuffer-sunxi.txt | 4 + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 43 +++++++++++ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 65 +++++++++++++++++ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 85 +++++++++++++++++++--- 7 files changed, 202 insertions(+), 13 deletions(-) -- 2.14.2

5 20

[PATCH] fbdev: au1200fb: delete duplicate header contents
by Rasmus Villemoes 04 Jan '18

04 Jan '18

This file has been copy-pasted-pasted: ~/linux$ x=drivers/video/fbdev/au1200fb.h; diff -u <(head -n 286 $x; head -n 286 $x) $x ~/linux$ Signed-off-by: Rasmus Villemoes <linux(a)rasmusvillemoes.dk> --- drivers/video/fbdev/au1200fb.h | 286 ----------------------------------------- 1 file changed, 286 deletions(-) diff --git a/drivers/video/fbdev/au1200fb.h b/drivers/video/fbdev/au1200fb.h index e2672714d8d4..b34fff342a1a 100644 --- a/drivers/video/fbdev/au1200fb.h +++ b/drivers/video/fbdev/au1200fb.h @@ -284,289 +284,3 @@ struct au1200_lcd { /********************************************************************/ #endif /* _AU1200LCD_H */ -/* - * BRIEF MODULE DESCRIPTION - * Hardware definitions for the Au1200 LCD controller - * - * Copyright 2004 AMD - * Author: AMD - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _AU1200LCD_H -#define _AU1200LCD_H - -/********************************************************************/ -#define AU1200_LCD_ADDR 0xB5000000 - -#define uint8 unsigned char -#define uint32 unsigned int - -struct au1200_lcd { - volatile uint32 reserved0; - volatile uint32 screen; - volatile uint32 backcolor; - volatile uint32 horztiming; - volatile uint32 verttiming; - volatile uint32 clkcontrol; - volatile uint32 pwmdiv; - volatile uint32 pwmhi; - volatile uint32 reserved1; - volatile uint32 winenable; - volatile uint32 colorkey; - volatile uint32 colorkeymsk; - struct - { - volatile uint32 cursorctrl; - volatile uint32 cursorpos; - volatile uint32 cursorcolor0; - volatile uint32 cursorcolor1; - volatile uint32 cursorcolor2; - uint32 cursorcolor3; - } hwc; - volatile uint32 intstatus; - volatile uint32 intenable; - volatile uint32 outmask; - volatile uint32 fifoctrl; - uint32 reserved2[(0x0100-0x0058)/4]; - struct - { - volatile uint32 winctrl0; - volatile uint32 winctrl1; - volatile uint32 winctrl2; - volatile uint32 winbuf0; - volatile uint32 winbuf1; - volatile uint32 winbufctrl; - uint32 winreserved0; - uint32 winreserved1; - } window[4]; - - uint32 reserved3[(0x0400-0x0180)/4]; - - volatile uint32 palette[(0x0800-0x0400)/4]; - - volatile uint8 cursorpattern[256]; -}; - -/* lcd_screen */ -#define LCD_SCREEN_SEN (1<<31) -#define LCD_SCREEN_SX (0x07FF<<19) -#define LCD_SCREEN_SY (0x07FF<< 8) -#define LCD_SCREEN_SWP (1<<7) -#define LCD_SCREEN_SWD (1<<6) -#define LCD_SCREEN_PT (7<<0) -#define LCD_SCREEN_PT_TFT (0<<0) -#define LCD_SCREEN_SX_N(WIDTH) ((WIDTH-1)<<19) -#define LCD_SCREEN_SY_N(HEIGHT) ((HEIGHT-1)<<8) -#define LCD_SCREEN_PT_CSTN (1<<0) -#define LCD_SCREEN_PT_CDSTN (2<<0) -#define LCD_SCREEN_PT_M8STN (3<<0) -#define LCD_SCREEN_PT_M4STN (4<<0) - -/* lcd_backcolor */ -#define LCD_BACKCOLOR_SBGR (0xFF<<16) -#define LCD_BACKCOLOR_SBGG (0xFF<<8) -#define LCD_BACKCOLOR_SBGB (0xFF<<0) -#define LCD_BACKCOLOR_SBGR_N(N) ((N)<<16) -#define LCD_BACKCOLOR_SBGG_N(N) ((N)<<8) -#define LCD_BACKCOLOR_SBGB_N(N) ((N)<<0) - -/* lcd_winenable */ -#define LCD_WINENABLE_WEN3 (1<<3) -#define LCD_WINENABLE_WEN2 (1<<2) -#define LCD_WINENABLE_WEN1 (1<<1) -#define LCD_WINENABLE_WEN0 (1<<0) - -/* lcd_colorkey */ -#define LCD_COLORKEY_CKR (0xFF<<16) -#define LCD_COLORKEY_CKG (0xFF<<8) -#define LCD_COLORKEY_CKB (0xFF<<0) -#define LCD_COLORKEY_CKR_N(N) ((N)<<16) -#define LCD_COLORKEY_CKG_N(N) ((N)<<8) -#define LCD_COLORKEY_CKB_N(N) ((N)<<0) - -/* lcd_colorkeymsk */ -#define LCD_COLORKEYMSK_CKMR (0xFF<<16) -#define LCD_COLORKEYMSK_CKMG (0xFF<<8) -#define LCD_COLORKEYMSK_CKMB (0xFF<<0) -#define LCD_COLORKEYMSK_CKMR_N(N) ((N)<<16) -#define LCD_COLORKEYMSK_CKMG_N(N) ((N)<<8) -#define LCD_COLORKEYMSK_CKMB_N(N) ((N)<<0) - -/* lcd windows control 0 */ -#define LCD_WINCTRL0_OX (0x07FF<<21) -#define LCD_WINCTRL0_OY (0x07FF<<10) -#define LCD_WINCTRL0_A (0x00FF<<2) -#define LCD_WINCTRL0_AEN (1<<1) -#define LCD_WINCTRL0_OX_N(N) ((N)<<21) -#define LCD_WINCTRL0_OY_N(N) ((N)<<10) -#define LCD_WINCTRL0_A_N(N) ((N)<<2) - -/* lcd windows control 1 */ -#define LCD_WINCTRL1_PRI (3<<30) -#define LCD_WINCTRL1_PIPE (1<<29) -#define LCD_WINCTRL1_FRM (0xF<<25) -#define LCD_WINCTRL1_CCO (1<<24) -#define LCD_WINCTRL1_PO (3<<22) -#define LCD_WINCTRL1_SZX (0x07FF<<11) -#define LCD_WINCTRL1_SZY (0x07FF<<0) -#define LCD_WINCTRL1_FRM_1BPP (0<<25) -#define LCD_WINCTRL1_FRM_2BPP (1<<25) -#define LCD_WINCTRL1_FRM_4BPP (2<<25) -#define LCD_WINCTRL1_FRM_8BPP (3<<25) -#define LCD_WINCTRL1_FRM_12BPP (4<<25) -#define LCD_WINCTRL1_FRM_16BPP655 (5<<25) -#define LCD_WINCTRL1_FRM_16BPP565 (6<<25) -#define LCD_WINCTRL1_FRM_16BPP556 (7<<25) -#define LCD_WINCTRL1_FRM_16BPPI1555 (8<<25) -#define LCD_WINCTRL1_FRM_16BPPI5551 (9<<25) -#define LCD_WINCTRL1_FRM_16BPPA1555 (10<<25) -#define LCD_WINCTRL1_FRM_16BPPA5551 (11<<25) -#define LCD_WINCTRL1_FRM_24BPP (12<<25) -#define LCD_WINCTRL1_FRM_32BPP (13<<25) -#define LCD_WINCTRL1_PRI_N(N) ((N)<<30) -#define LCD_WINCTRL1_PO_00 (0<<22) -#define LCD_WINCTRL1_PO_01 (1<<22) -#define LCD_WINCTRL1_PO_10 (2<<22) -#define LCD_WINCTRL1_PO_11 (3<<22) -#define LCD_WINCTRL1_SZX_N(N) ((N-1)<<11) -#define LCD_WINCTRL1_SZY_N(N) ((N-1)<<0) - -/* lcd windows control 2 */ -#define LCD_WINCTRL2_CKMODE (3<<24) -#define LCD_WINCTRL2_DBM (1<<23) -#define LCD_WINCTRL2_RAM (3<<21) -#define LCD_WINCTRL2_BX (0x1FFF<<8) -#define LCD_WINCTRL2_SCX (0xF<<4) -#define LCD_WINCTRL2_SCY (0xF<<0) -#define LCD_WINCTRL2_CKMODE_00 (0<<24) -#define LCD_WINCTRL2_CKMODE_01 (1<<24) -#define LCD_WINCTRL2_CKMODE_10 (2<<24) -#define LCD_WINCTRL2_CKMODE_11 (3<<24) -#define LCD_WINCTRL2_RAM_NONE (0<<21) -#define LCD_WINCTRL2_RAM_PALETTE (1<<21) -#define LCD_WINCTRL2_RAM_GAMMA (2<<21) -#define LCD_WINCTRL2_RAM_BUFFER (3<<21) -#define LCD_WINCTRL2_BX_N(N) ((N)<<8) -#define LCD_WINCTRL2_SCX_1 (0<<4) -#define LCD_WINCTRL2_SCX_2 (1<<4) -#define LCD_WINCTRL2_SCX_4 (2<<4) -#define LCD_WINCTRL2_SCY_1 (0<<0) -#define LCD_WINCTRL2_SCY_2 (1<<0) -#define LCD_WINCTRL2_SCY_4 (2<<0) - -/* lcd windows buffer control */ -#define LCD_WINBUFCTRL_DB (1<<1) -#define LCD_WINBUFCTRL_DBN (1<<0) - -/* lcd_intstatus, lcd_intenable */ -#define LCD_INT_IFO (0xF<<14) -#define LCD_INT_IFU (0xF<<10) -#define LCD_INT_OFO (1<<9) -#define LCD_INT_OFU (1<<8) -#define LCD_INT_WAIT (1<<3) -#define LCD_INT_SD (1<<2) -#define LCD_INT_SA (1<<1) -#define LCD_INT_SS (1<<0) - -/* lcd_horztiming */ -#define LCD_HORZTIMING_HND2 (0x1FF<<18) -#define LCD_HORZTIMING_HND1 (0x1FF<<9) -#define LCD_HORZTIMING_HPW (0x1FF<<0) -#define LCD_HORZTIMING_HND2_N(N)(((N)-1)<<18) -#define LCD_HORZTIMING_HND1_N(N)(((N)-1)<<9) -#define LCD_HORZTIMING_HPW_N(N) (((N)-1)<<0) - -/* lcd_verttiming */ -#define LCD_VERTTIMING_VND2 (0x1FF<<18) -#define LCD_VERTTIMING_VND1 (0x1FF<<9) -#define LCD_VERTTIMING_VPW (0x1FF<<0) -#define LCD_VERTTIMING_VND2_N(N)(((N)-1)<<18) -#define LCD_VERTTIMING_VND1_N(N)(((N)-1)<<9) -#define LCD_VERTTIMING_VPW_N(N) (((N)-1)<<0) - -/* lcd_clkcontrol */ -#define LCD_CLKCONTROL_EXT (1<<22) -#define LCD_CLKCONTROL_DELAY (3<<20) -#define LCD_CLKCONTROL_CDD (1<<19) -#define LCD_CLKCONTROL_IB (1<<18) -#define LCD_CLKCONTROL_IC (1<<17) -#define LCD_CLKCONTROL_IH (1<<16) -#define LCD_CLKCONTROL_IV (1<<15) -#define LCD_CLKCONTROL_BF (0x1F<<10) -#define LCD_CLKCONTROL_PCD (0x3FF<<0) -#define LCD_CLKCONTROL_BF_N(N) (((N)-1)<<10) -#define LCD_CLKCONTROL_PCD_N(N) ((N)<<0) - -/* lcd_pwmdiv */ -#define LCD_PWMDIV_EN (1<<31) -#define LCD_PWMDIV_PWMDIV (0x1FFFF<<0) -#define LCD_PWMDIV_PWMDIV_N(N) ((N)<<0) - -/* lcd_pwmhi */ -#define LCD_PWMHI_PWMHI1 (0xFFFF<<16) -#define LCD_PWMHI_PWMHI0 (0xFFFF<<0) -#define LCD_PWMHI_PWMHI1_N(N) ((N)<<16) -#define LCD_PWMHI_PWMHI0_N(N) ((N)<<0) - -/* lcd_hwccon */ -#define LCD_HWCCON_EN (1<<0) - -/* lcd_cursorpos */ -#define LCD_CURSORPOS_HWCXOFF (0x1F<<27) -#define LCD_CURSORPOS_HWCXPOS (0x07FF<<16) -#define LCD_CURSORPOS_HWCYOFF (0x1F<<11) -#define LCD_CURSORPOS_HWCYPOS (0x07FF<<0) -#define LCD_CURSORPOS_HWCXOFF_N(N) ((N)<<27) -#define LCD_CURSORPOS_HWCXPOS_N(N) ((N)<<16) -#define LCD_CURSORPOS_HWCYOFF_N(N) ((N)<<11) -#define LCD_CURSORPOS_HWCYPOS_N(N) ((N)<<0) - -/* lcd_cursorcolor */ -#define LCD_CURSORCOLOR_HWCA (0xFF<<24) -#define LCD_CURSORCOLOR_HWCR (0xFF<<16) -#define LCD_CURSORCOLOR_HWCG (0xFF<<8) -#define LCD_CURSORCOLOR_HWCB (0xFF<<0) -#define LCD_CURSORCOLOR_HWCA_N(N) ((N)<<24) -#define LCD_CURSORCOLOR_HWCR_N(N) ((N)<<16) -#define LCD_CURSORCOLOR_HWCG_N(N) ((N)<<8) -#define LCD_CURSORCOLOR_HWCB_N(N) ((N)<<0) - -/* lcd_fifoctrl */ -#define LCD_FIFOCTRL_F3IF (1<<29) -#define LCD_FIFOCTRL_F3REQ (0x1F<<24) -#define LCD_FIFOCTRL_F2IF (1<<29) -#define LCD_FIFOCTRL_F2REQ (0x1F<<16) -#define LCD_FIFOCTRL_F1IF (1<<29) -#define LCD_FIFOCTRL_F1REQ (0x1F<<8) -#define LCD_FIFOCTRL_F0IF (1<<29) -#define LCD_FIFOCTRL_F0REQ (0x1F<<0) -#define LCD_FIFOCTRL_F3REQ_N(N) ((N-1)<<24) -#define LCD_FIFOCTRL_F2REQ_N(N) ((N-1)<<16) -#define LCD_FIFOCTRL_F1REQ_N(N) ((N-1)<<8) -#define LCD_FIFOCTRL_F0REQ_N(N) ((N-1)<<0) - -/* lcd_outmask */ -#define LCD_OUTMASK_MASK (0x00FFFFFF) - -/********************************************************************/ -#endif /* _AU1200LCD_H */ -- 2.11.0

2 1

[PATCH v2] fbdev: pxa3xx: use ktime_get_ts64 for time stamps
by Arnd Bergmann 04 Jan '18

04 Jan '18

do_gettimeofday() is deprecated because it is not y2038 safe, so I'm changing the calculation for the diagnostic output over to using 'timespec64'. We really only print time deltas here, so changing it to monotonic time makes this more robust, the correct accessor for this is ktime_get_ts64(). Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- v2: fix typo --- drivers/video/fbdev/pxa3xx-gcu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c index 55fbb432c053..0955622a1227 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.c +++ b/drivers/video/fbdev/pxa3xx-gcu.c @@ -104,7 +104,7 @@ struct pxa3xx_gcu_priv { wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; - struct timeval base_time; + struct timespec64 base_time; struct pxa3xx_gcu_batch *free; struct pxa3xx_gcu_batch *ready; @@ -126,18 +126,20 @@ gc_writel(struct pxa3xx_gcu_priv *priv, unsigned int off, unsigned long val) #define QPRINT(priv, level, msg) \ do { \ - struct timeval tv; \ + struct timespec64 ts; \ struct pxa3xx_gcu_shared *shared = priv->shared; \ u32 base = gc_readl(priv, REG_GCRBBR); \ \ - do_gettimeofday(&tv); \ + ktime_get_ts64(&ts); \ + ts = timespec64_sub(ts, priv->base_time); \ \ - printk(level "%ld.%03ld.%03ld - %-17s: %-21s (%s, " \ + printk(level "%lld.%03ld.%03ld - %-17s: %-21s (%s, " \ "STATUS " \ "0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, " \ "T %5ld)\n", \ - tv.tv_sec - priv->base_time.tv_sec, \ - tv.tv_usec / 1000, tv.tv_usec % 1000, \ + (s64)(ts.tv_sec), \ + ts.tv_nsec / NSEC_PER_MSEC, \ + (ts.tv_nsec % NSEC_PER_MSEC) / USEC_PER_MSEC, \ __func__, msg, \ shared->hw_running ? "running" : " idle", \ gc_readl(priv, REG_GCISCR), \ @@ -164,7 +166,7 @@ pxa3xx_gcu_reset(struct pxa3xx_gcu_priv *priv) priv->shared->buffer_phys = priv->shared_phys; priv->shared->magic = PXA3XX_GCU_SHARED_MAGIC; - do_gettimeofday(&priv->base_time); + ktime_get_ts64(&priv->base_time); /* set up the ring buffer pointers */ gc_writel(priv, REG_GCRBLR, 0); -- 2.9.0

2 1

[PATCH 1/2] fbdev: pxa3xx: use ktime_get_ts64 for time stamps
by Arnd Bergmann 04 Jan '18

04 Jan '18

do_gettimeofday() is deprecated because it is not y2038 safe, so I'm changing the calculation for the diagnostic output over to using 'timespec64'. We really only print time deltas here, so changing it to monotonic time makes this more robust, the correct accessor for this is ktime_get_ts64(). Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/video/fbdev/pxa3xx-gcu.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/video/fbdev/pxa3xx-gcu.c b/drivers/video/fbdev/pxa3xx-gcu.c index 3366076f9e0f..ddca4425adc8 100644 --- a/drivers/video/fbdev/pxa3xx-gcu.c +++ b/drivers/video/fbdev/pxa3xx-gcu.c @@ -104,7 +104,7 @@ struct pxa3xx_gcu_priv { wait_queue_head_t wait_idle; wait_queue_head_t wait_free; spinlock_t spinlock; - struct timeval base_time; + struct timespec64 base_time; struct pxa3xx_gcu_batch *free; struct pxa3xx_gcu_batch *ready; @@ -126,18 +126,20 @@ gc_writel(struct pxa3xx_gcu_priv *priv, unsigned int off, unsigned long val) #define QPRINT(priv, level, msg) \ do { \ - struct timeval tv; \ + struct timespec64 ts; \ struct pxa3xx_gcu_shared *shared = priv->shared; \ u32 base = gc_readl(priv, REG_GCRBBR); \ \ - do_gettimeofday(&tv); \ + ktime_get_ts64(&ts); \ + ts = timespec64_sub(ts, priv->base_time); \ \ - printk(level "%ld.%03ld.%03ld - %-17s: %-21s (%s, " \ + printk(level "%lld.%03ld.%03ld - %-17s: %-21s (%s, " \ "STATUS " \ "0x%02lx, B 0x%08lx [%ld], E %5ld, H %5ld, " \ "T %5ld)\n", \ - tv.tv_sec - priv->base_time.tv_sec, \ - tv.tv_usec / 1000, tv.tv_usec % 1000, \ + (s64)(tv.tv_sec), \ + tv.tv_usec / NSEC_PER_MSEC, \ + (tv.tv_usec % NSEC_PER_MSEC) / USEC_PER_MSEC, \ __func__, msg, \ shared->hw_running ? "running" : " idle", \ gc_readl(priv, REG_GCISCR), \ @@ -164,7 +166,7 @@ pxa3xx_gcu_reset(struct pxa3xx_gcu_priv *priv) priv->shared->buffer_phys = priv->shared_phys; priv->shared->magic = PXA3XX_GCU_SHARED_MAGIC; - do_gettimeofday(&priv->base_time); + ktime_get_ts64(&priv->base_time); /* set up the ring buffer pointers */ gc_writel(priv, REG_GCRBLR, 0); -- 2.9.0

2 3

[PATCH V4 09/26] drm/nouveau: deprecate pci_get_bus_and_slot()
by Sinan Kaya 04 Jan '18

04 Jan '18

pci_get_bus_and_slot() is restrictive such that it assumes domain=0 as where a PCI device is present. This restricts the device drivers to be reused for other domain numbers. Getting ready to remove pci_get_bus_and_slot() function in favor of pci_get_domain_bus_and_slot(). Replace pci_get_bus_and_slot() with pci_get_domain_bus_and_slot() and extract the domain number from 1. struct pci_dev 2. struct pci_dev through drm_device->pdev 3. struct pci_dev through fb->subdev->drm_device->pdev Signed-off-by: Sinan Kaya <okaya(a)codeaurora.org> --- drivers/gpu/drm/nouveau/dispnv04/arb.c | 4 +++- drivers/gpu/drm/nouveau/dispnv04/hw.c | 10 +++++++--- drivers/gpu/drm/nouveau/nouveau_drm.c | 3 ++- drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c | 10 +++++++++- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/nouveau/dispnv04/arb.c b/drivers/gpu/drm/nouveau/dispnv04/arb.c index 90075b6..c79160c 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/arb.c +++ b/drivers/gpu/drm/nouveau/dispnv04/arb.c @@ -213,8 +213,10 @@ struct nv_sim_state { if ((dev->pdev->device & 0xffff) == 0x01a0 /*CHIPSET_NFORCE*/ || (dev->pdev->device & 0xffff) == 0x01f0 /*CHIPSET_NFORCE2*/) { uint32_t type; + int domain = pci_domain_nr(dev->pdev->bus); - pci_read_config_dword(pci_get_bus_and_slot(0, 1), 0x7c, &type); + pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 1), + 0x7c, &type); sim_data.memory_type = (type >> 12) & 1; sim_data.memory_width = 64; diff --git a/drivers/gpu/drm/nouveau/dispnv04/hw.c b/drivers/gpu/drm/nouveau/dispnv04/hw.c index b985990..0c9bdf0 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/hw.c +++ b/drivers/gpu/drm/nouveau/dispnv04/hw.c @@ -216,12 +216,15 @@ { struct nvkm_pll_vals pllvals; int ret; + int domain; + + domain = pci_domain_nr(dev->pdev->bus); if (plltype == PLL_MEMORY && (dev->pdev->device & 0x0ff0) == CHIPSET_NFORCE) { uint32_t mpllP; - - pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP); + pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 3), + 0x6c, &mpllP); mpllP = (mpllP >> 8) & 0xf; if (!mpllP) mpllP = 4; @@ -232,7 +235,8 @@ (dev->pdev->device & 0xff0) == CHIPSET_NFORCE2) { uint32_t clock; - pci_read_config_dword(pci_get_bus_and_slot(0, 5), 0x4c, &clock); + pci_read_config_dword(pci_get_domain_bus_and_slot(domain, 0, 5), + 0x4c, &clock); return clock / 1000; } diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8d4a5be..33b6139 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -524,7 +524,8 @@ static int nouveau_drm_probe(struct pci_dev *pdev, } /* subfunction one is a hdmi audio device? */ - drm->hdmi_device = pci_get_bus_and_slot((unsigned int)pdev->bus->number, + drm->hdmi_device = pci_get_domain_bus_and_slot(pci_domain_nr(pdev->bus), + (unsigned int)pdev->bus->number, PCI_DEVFN(PCI_SLOT(pdev->devfn), 1)); if (!drm->hdmi_device) { diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c index 4c07d10..18241c6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c @@ -28,8 +28,16 @@ { struct pci_dev *bridge; u32 mem, mib; + int domain = 0; + struct pci_dev *pdev = NULL; - bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 1)); + if (dev_is_pci(fb->subdev.device->dev)) + pdev = to_pci_dev(fb->subdev.device->dev); + + if (pdev) + domain = pci_domain_nr(pdev->bus); + + bridge = pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(0, 1)); if (!bridge) { nvkm_error(&fb->subdev, "no bridge device\n"); return -ENODEV; -- 1.9.1

1 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2018