mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-09-04 20:19:47 +08:00 
			
		
		
		
	 be8454afc5
			
		
	
	
		be8454afc5
		
	
	
	
	
		
			
			-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJdLMSbAAoJEAx081l5xIa+udkP/iWr8mw44tWYb8Wuzc/aR91v 02X/J4S9XTQttNn/1Gpq9ItTLMf0Gc08tk1wEBBHAWi/qGaGZS2al+rv0afeuuQa aFhQzioDi7K/YZt92iEJhdx7wVMyydICTg3INmYlSP7/FyzLp6gBQRGSJ1kX5mHZ qWsFZgUOH9V5evyB6fDMleDaqFOKfcwrD7XYwbOheL/HeYQSv5AYn3VBupBFQ76L 0hclI5VzZQ5V0nnqRTNDQVA9Yl6NTl+2eXTn5vuBtwKXEI6JJw8eihZp2oZDXqfS L441w7wGbkRPzN5kjMZjs1ToPMTlMveR5kL6Sc+o3DT/HmIr1odeaSDXR/93UOLd z0CRJ6xMC8h1ThLNHp8UgbxCKqIwYPsY2wVqjsJt7lDY5jma7Yv2YJ9ocYGHN/sO DVHcU6ugbwvuC5wZZtVZl5J4hjnBZwNRGSVK+iM0tkjalgdEuSFehXT7eQ8SphF/ yI5gD1xNEwGfZ4bvZ3u/QrDCcpUAgPIUYmxEa2tPJILQWOJ9O87yc0y9Z21k9Ef1 9yDqrFV3sPqC2xj/0ufZG/18+Yt99Ykg1jQE3RGDwD/59KAeqPbOvqTKyVODV9jE qje6ScSIc2G0713uss2bcaD3k+rCB5YL2JkKrk5OWW/T2+n9T+JFaiNh7dnSFFcU gBKyeY24OyCDMwXrby0K =SI+Y -----END PGP SIGNATURE----- Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm Pull drm updates from Dave Airlie: "The biggest thing in this is the AMD Navi GPU support, this again contains a bunch of header files that are large. These are the new AMD RX5700 GPUs that just recently became available. New drivers: - ST-Ericsson MCDE driver - Ingenic JZ47xx SoC UAPI change: - HDR source metadata property Core: - HDR inforframes and EDID parsing - drm hdmi infoframe unpacking - remove prime sg_table caching into dma-buf - New gem vram helpers to reduce driver code - Lots of drmP.h removal - reservation fencing fix - documentation updates - drm_fb_helper_connector removed - mode name command handler rewrite fbcon: - Remove the fbcon notifiers ttm: - forward progress fixes dma-buf: - make mmap call optional - debugfs refcount fixes - dma-fence free with pending signals fix - each dma-buf gets an inode Panels: - Lots of additional panel bindings amdgpu: - initial navi10 support - avoid hw reset - HDR metadata support - new thermal sensors for vega asics - RAS fixes - use HMM rather than MMU notifier - xgmi topology via kfd - SR-IOV fixes - driver reload fixes - DC use a core bpc attribute - Aux fixes for DC - Bandwidth calc updates for DC - Clock handling refactor - kfd VEGAM support vmwgfx: - Coherent memory support changes i915: - HDR Support - HDMI i2c link - Icelake multi-segmented gamma support - GuC firmware update - Mule Creek Canyon PCH support for EHL - EHL platform updtes - move i915.alpha_support to i915.force_probe - runtime PM refactoring - VBT parsing refactoring - DSI fixes - struct mutex dependency reduction - GEM code reorg mali-dp: - Komeda driver features msm: - dsi vs EPROBE_DEFER fixes - msm8998 snapdragon 835 support - a540 gpu support - mdp5 and dpu interconnect support exynos: - drmP.h removal tegra: - misc fixes tda998x: - audio support improvements - pixel repeated mode support - quantisation range handling corrections - HDMI vendor info fix armada: - interlace support fix - overlay/video plane register handling refactor - add gamma support rockchip: - RX3328 support panfrost: - expose perf counters via hidden ioctls vkms: - enumerate CRC sources list ast: - rework BO handling mgag200: - rework BO handling dw-hdmi: - suspend/resume support rcar-du: - R8A774A1 Soc Support - LVDS dual-link mode support - Additional formats - Misc fixes omapdrm: - DSI command mode display support stm - fb modifier support - runtime PM support sun4i: - use vmap ops vc4: - binner bo binding rework v3d: - compute shader support - resync/sync fixes - job management refactoring lima: - NULL pointer in irq handler fix - scheduler default timeout virtio: - fence seqno support - trace events bochs: - misc fixes tc458767: - IRQ/HDP handling sii902x: - HDMI audio support atmel-hlcdc: - misc fixes meson: - zpos support" * tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm: (1815 commits) Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next" Revert "mm: adjust apply_to_pfn_range interface for dropped token." mm: adjust apply_to_pfn_range interface for dropped token. drm/amdgpu/navi10: add uclk activity sensor drm/amdgpu: properly guard the generic discovery code drm/amdgpu: add missing documentation on new module parameters drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback drm/amd/display: avoid 64-bit division drm/amdgpu/psp11: simplify the ucode register logic drm/amdgpu: properly guard DC support in navi code drm/amd/powerplay: vega20: fix uninitialized variable use drm/amd/display: dcn20: include linux/delay.h amdgpu: make pmu support optional drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq drm/amd/powerplay: Use memset to initialize metrics structs drm/amdgpu/mes10.1: Fix header guard drm/amd/powerplay: add temperature sensor support for navi10 drm/amdgpu: fix scheduler timeout calc drm/amdgpu: Prepare for hmm_range_register API change (v2) ...
		
			
				
	
	
		
			82 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			82 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /* SPDX-License-Identifier: GPL-2.0-only */
 | |
| /*
 | |
|  * Copyright (C) 2012 Russell King
 | |
|  */
 | |
| #ifndef ARMADA_DRM_H
 | |
| #define ARMADA_DRM_H
 | |
| 
 | |
| #include <linux/kfifo.h>
 | |
| #include <linux/io.h>
 | |
| #include <linux/workqueue.h>
 | |
| #include <drm/drmP.h>
 | |
| 
 | |
| struct armada_crtc;
 | |
| struct armada_gem_object;
 | |
| struct clk;
 | |
| struct drm_fb_helper;
 | |
| 
 | |
| static inline void
 | |
| armada_updatel(uint32_t val, uint32_t mask, void __iomem *ptr)
 | |
| {
 | |
| 	uint32_t ov, v;
 | |
| 
 | |
| 	ov = v = readl_relaxed(ptr);
 | |
| 	v = (v & ~mask) | val;
 | |
| 	if (ov != v)
 | |
| 		writel_relaxed(v, ptr);
 | |
| }
 | |
| 
 | |
| static inline uint32_t armada_pitch(uint32_t width, uint32_t bpp)
 | |
| {
 | |
| 	uint32_t pitch = bpp != 4 ? width * ((bpp + 7) / 8) : width / 2;
 | |
| 
 | |
| 	/* 88AP510 spec recommends pitch be a multiple of 128 */
 | |
| 	return ALIGN(pitch, 128);
 | |
| }
 | |
| 
 | |
| 
 | |
| struct armada_private;
 | |
| 
 | |
| struct armada_variant {
 | |
| 	bool has_spu_adv_reg;
 | |
| 	int (*init)(struct armada_crtc *, struct device *);
 | |
| 	int (*compute_clock)(struct armada_crtc *,
 | |
| 			     const struct drm_display_mode *,
 | |
| 			     uint32_t *);
 | |
| 	void (*disable)(struct armada_crtc *);
 | |
| 	void (*enable)(struct armada_crtc *, const struct drm_display_mode *);
 | |
| };
 | |
| 
 | |
| /* Variant ops */
 | |
| extern const struct armada_variant armada510_ops;
 | |
| 
 | |
| struct armada_private {
 | |
| 	struct drm_device	drm;
 | |
| 	struct drm_fb_helper	*fbdev;
 | |
| 	struct armada_crtc	*dcrtc[2];
 | |
| 	struct drm_mm		linear; /* protected by linear_lock */
 | |
| 	struct mutex		linear_lock;
 | |
| 	struct drm_property	*colorkey_prop;
 | |
| 	struct drm_property	*colorkey_min_prop;
 | |
| 	struct drm_property	*colorkey_max_prop;
 | |
| 	struct drm_property	*colorkey_val_prop;
 | |
| 	struct drm_property	*colorkey_alpha_prop;
 | |
| 	struct drm_property	*colorkey_mode_prop;
 | |
| 	struct drm_property	*brightness_prop;
 | |
| 	struct drm_property	*contrast_prop;
 | |
| 	struct drm_property	*saturation_prop;
 | |
| #ifdef CONFIG_DEBUG_FS
 | |
| 	struct dentry		*de;
 | |
| #endif
 | |
| };
 | |
| 
 | |
| int armada_fbdev_init(struct drm_device *);
 | |
| void armada_fbdev_fini(struct drm_device *);
 | |
| 
 | |
| int armada_overlay_plane_create(struct drm_device *, unsigned long);
 | |
| 
 | |
| void armada_drm_crtc_debugfs_init(struct armada_crtc *dcrtc);
 | |
| int armada_drm_debugfs_init(struct drm_minor *);
 | |
| 
 | |
| #endif
 |