Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/atomic-helper: Move DRM_PLANE_HELPER_NO_SCALING to atomic helpers

The macro DRM_PLANE_HELPER_NO_SCALING is only useful with the interfaces
in drm_atomic_helper.h, but defined in drm_plane_helper.h. So half of
DRM includes the latter header file for using this macro. Move the macro
and remove the include statements.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220720083058.15371-3-tzimmermann@suse.de

+9 -38
-1
drivers/gpu/drm/arm/hdlcd_crtc.c
··· 23 23 #include <drm/drm_framebuffer.h> 24 24 #include <drm/drm_gem_cma_helper.h> 25 25 #include <drm/drm_of.h> 26 - #include <drm/drm_plane_helper.h> 27 26 #include <drm/drm_probe_helper.h> 28 27 #include <drm/drm_vblank.h> 29 28
-1
drivers/gpu/drm/ast/ast_mode.c
··· 42 42 #include <drm/drm_gem_framebuffer_helper.h> 43 43 #include <drm/drm_gem_vram_helper.h> 44 44 #include <drm/drm_managed.h> 45 - #include <drm/drm_plane_helper.h> 46 45 #include <drm/drm_probe_helper.h> 47 46 #include <drm/drm_simple_kms_helper.h> 48 47
-1
drivers/gpu/drm/drm_simple_kms_helper.c
··· 12 12 #include <drm/drm_drv.h> 13 13 #include <drm/drm_gem_atomic_helper.h> 14 14 #include <drm/drm_managed.h> 15 - #include <drm/drm_plane_helper.h> 16 15 #include <drm/drm_probe_helper.h> 17 16 #include <drm/drm_simple_kms_helper.h> 18 17
-1
drivers/gpu/drm/i915/display/i9xx_plane.c
··· 7 7 #include <drm/drm_atomic_helper.h> 8 8 #include <drm/drm_blend.h> 9 9 #include <drm/drm_fourcc.h> 10 - #include <drm/drm_plane_helper.h> 11 10 12 11 #include "intel_atomic.h" 13 12 #include "intel_atomic_plane.h"
-1
drivers/gpu/drm/i915/display/intel_cursor.c
··· 8 8 #include <drm/drm_atomic_uapi.h> 9 9 #include <drm/drm_blend.h> 10 10 #include <drm/drm_damage_helper.h> 11 - #include <drm/drm_plane_helper.h> 12 11 #include <drm/drm_fourcc.h> 13 12 14 13 #include "intel_atomic.h"
-1
drivers/gpu/drm/i915/display/intel_sprite.c
··· 39 39 #include <drm/drm_crtc.h> 40 40 #include <drm/drm_damage_helper.h> 41 41 #include <drm/drm_fourcc.h> 42 - #include <drm/drm_plane_helper.h> 43 42 #include <drm/drm_rect.h> 44 43 45 44 #include "i915_drv.h"
-1
drivers/gpu/drm/i915/display/skl_universal_plane.c
··· 7 7 #include <drm/drm_blend.h> 8 8 #include <drm/drm_damage_helper.h> 9 9 #include <drm/drm_fourcc.h> 10 - #include <drm/drm_plane_helper.h> 11 10 12 11 #include "i915_drv.h" 13 12 #include "intel_atomic_plane.h"
-1
drivers/gpu/drm/imx/ipuv3-plane.c
··· 14 14 #include <drm/drm_gem_atomic_helper.h> 15 15 #include <drm/drm_gem_cma_helper.h> 16 16 #include <drm/drm_managed.h> 17 - #include <drm/drm_plane_helper.h> 18 17 19 18 #include <video/imx-ipu-v3.h> 20 19
-1
drivers/gpu/drm/ingenic/ingenic-drm-drv.c
··· 41 41 #include <drm/drm_of.h> 42 42 #include <drm/drm_panel.h> 43 43 #include <drm/drm_plane.h> 44 - #include <drm/drm_plane_helper.h> 45 44 #include <drm/drm_probe_helper.h> 46 45 #include <drm/drm_vblank.h> 47 46
-1
drivers/gpu/drm/kmb/kmb_plane.c
··· 14 14 #include <drm/drm_framebuffer.h> 15 15 #include <drm/drm_gem_cma_helper.h> 16 16 #include <drm/drm_managed.h> 17 - #include <drm/drm_plane_helper.h> 18 17 19 18 #include "kmb_drv.h" 20 19 #include "kmb_plane.h"
-1
drivers/gpu/drm/logicvc/logicvc_layer.c
··· 14 14 #include <drm/drm_fourcc.h> 15 15 #include <drm/drm_framebuffer.h> 16 16 #include <drm/drm_plane.h> 17 - #include <drm/drm_plane_helper.h> 18 17 #include <drm/drm_print.h> 19 18 20 19 #include "logicvc_crtc.h"
-1
drivers/gpu/drm/mediatek/mtk_drm_plane.c
··· 11 11 #include <drm/drm_fourcc.h> 12 12 #include <drm/drm_framebuffer.h> 13 13 #include <drm/drm_gem_atomic_helper.h> 14 - #include <drm/drm_plane_helper.h> 15 14 16 15 #include "mtk_drm_crtc.h" 17 16 #include "mtk_drm_ddp_comp.h"
-1
drivers/gpu/drm/meson/meson_plane.c
··· 20 20 #include <drm/drm_framebuffer.h> 21 21 #include <drm/drm_gem_atomic_helper.h> 22 22 #include <drm/drm_gem_cma_helper.h> 23 - #include <drm/drm_plane_helper.h> 24 23 25 24 #include "meson_plane.h" 26 25 #include "meson_registers.h"
-1
drivers/gpu/drm/mxsfb/lcdif_kms.c
··· 23 23 #include <drm/drm_gem_atomic_helper.h> 24 24 #include <drm/drm_gem_cma_helper.h> 25 25 #include <drm/drm_plane.h> 26 - #include <drm/drm_plane_helper.h> 27 26 #include <drm/drm_vblank.h> 28 27 29 28 #include "lcdif_drv.h"
-1
drivers/gpu/drm/mxsfb/mxsfb_kms.c
··· 26 26 #include <drm/drm_gem_atomic_helper.h> 27 27 #include <drm/drm_gem_cma_helper.h> 28 28 #include <drm/drm_plane.h> 29 - #include <drm/drm_plane_helper.h> 30 29 #include <drm/drm_vblank.h> 31 30 32 31 #include "mxsfb_drv.h"
-1
drivers/gpu/drm/nouveau/dispnv50/base507c.c
··· 30 30 31 31 #include <drm/drm_atomic_helper.h> 32 32 #include <drm/drm_fourcc.h> 33 - #include <drm/drm_plane_helper.h> 34 33 35 34 #include "nouveau_bo.h" 36 35
-1
drivers/gpu/drm/nouveau/dispnv50/curs507a.c
··· 29 29 #include <nvhw/class/cl507a.h> 30 30 31 31 #include <drm/drm_atomic_helper.h> 32 - #include <drm/drm_plane_helper.h> 33 32 34 33 bool 35 34 curs507a_space(struct nv50_wndw *wndw)
-1
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
··· 24 24 25 25 #include <drm/drm_atomic_helper.h> 26 26 #include <drm/drm_fourcc.h> 27 - #include <drm/drm_plane_helper.h> 28 27 29 28 #include <nvif/cl507e.h> 30 29 #include <nvif/event.h>
-1
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
··· 23 23 #include "atom.h" 24 24 25 25 #include <drm/drm_atomic_helper.h> 26 - #include <drm/drm_plane_helper.h> 27 26 #include <nouveau_bo.h> 28 27 29 28 #include <nvif/clc37e.h>
-1
drivers/gpu/drm/rcar-du/rcar_du_plane.c
··· 16 16 #include <drm/drm_fourcc.h> 17 17 #include <drm/drm_framebuffer.h> 18 18 #include <drm/drm_gem_cma_helper.h> 19 - #include <drm/drm_plane_helper.h> 20 19 21 20 #include "rcar_du_drv.h" 22 21 #include "rcar_du_group.h"
-1
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
··· 27 27 #include <drm/drm_framebuffer.h> 28 28 #include <drm/drm_gem_atomic_helper.h> 29 29 #include <drm/drm_gem_framebuffer_helper.h> 30 - #include <drm/drm_plane_helper.h> 31 30 #include <drm/drm_probe_helper.h> 32 31 #include <drm/drm_self_refresh_helper.h> 33 32 #include <drm/drm_vblank.h>
-1
drivers/gpu/drm/sprd/sprd_dpu.c
··· 23 23 #include <drm/drm_framebuffer.h> 24 24 #include <drm/drm_gem_cma_helper.h> 25 25 #include <drm/drm_gem_framebuffer_helper.h> 26 - #include <drm/drm_plane_helper.h> 27 26 28 27 #include "sprd_drm.h" 29 28 #include "sprd_dpu.h"
-1
drivers/gpu/drm/sun4i/sun8i_ui_layer.c
··· 18 18 #include <drm/drm_framebuffer.h> 19 19 #include <drm/drm_gem_atomic_helper.h> 20 20 #include <drm/drm_gem_cma_helper.h> 21 - #include <drm/drm_plane_helper.h> 22 21 #include <drm/drm_probe_helper.h> 23 22 24 23 #include "sun8i_mixer.h"
-1
drivers/gpu/drm/sun4i/sun8i_vi_layer.c
··· 11 11 #include <drm/drm_framebuffer.h> 12 12 #include <drm/drm_gem_atomic_helper.h> 13 13 #include <drm/drm_gem_cma_helper.h> 14 - #include <drm/drm_plane_helper.h> 15 14 #include <drm/drm_probe_helper.h> 16 15 17 16 #include "sun8i_csc.h"
-1
drivers/gpu/drm/tests/drm_plane_helper_test.c
··· 9 9 10 10 #include <drm/drm_atomic_helper.h> 11 11 #include <drm/drm_framebuffer.h> 12 - #include <drm/drm_plane_helper.h> 13 12 #include <drm/drm_modes.h> 14 13 15 14 static void set_src(struct drm_plane_state *plane_state,
-1
drivers/gpu/drm/virtio/virtgpu_plane.c
··· 26 26 #include <drm/drm_atomic_helper.h> 27 27 #include <drm/drm_damage_helper.h> 28 28 #include <drm/drm_fourcc.h> 29 - #include <drm/drm_plane_helper.h> 30 29 31 30 #include "virtgpu_drv.h" 32 31
-1
drivers/gpu/drm/vkms/vkms_plane.c
··· 7 7 #include <drm/drm_fourcc.h> 8 8 #include <drm/drm_gem_atomic_helper.h> 9 9 #include <drm/drm_gem_framebuffer_helper.h> 10 - #include <drm/drm_plane_helper.h> 11 10 12 11 #include "vkms_drv.h" 13 12
-1
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
··· 29 29 #include <drm/drm_atomic_helper.h> 30 30 #include <drm/drm_damage_helper.h> 31 31 #include <drm/drm_fourcc.h> 32 - #include <drm/drm_plane_helper.h> 33 32 #include <drm/drm_rect.h> 34 33 #include <drm/drm_sysfs.h> 35 34 #include <drm/drm_vblank.h>
-1
drivers/gpu/drm/xlnx/zynqmp_disp.c
··· 20 20 #include <drm/drm_framebuffer.h> 21 21 #include <drm/drm_managed.h> 22 22 #include <drm/drm_plane.h> 23 - #include <drm/drm_plane_helper.h> 24 23 #include <drm/drm_vblank.h> 25 24 26 25 #include <linux/clk.h>
+9
include/drm/drm_atomic_helper.h
··· 34 34 #include <drm/drm_atomic_state_helper.h> 35 35 #include <drm/drm_util.h> 36 36 37 + /* 38 + * Drivers that don't allow primary plane scaling may pass this macro in place 39 + * of the min/max scale parameters of the plane-state checker function. 40 + * 41 + * Due to src being in 16.16 fixed point and dest being in integer pixels, 42 + * 1<<16 represents no scaling. 43 + */ 44 + #define DRM_PLANE_HELPER_NO_SCALING (1<<16) 45 + 37 46 struct drm_atomic_state; 38 47 struct drm_private_obj; 39 48 struct drm_private_state;
-9
include/drm/drm_plane_helper.h
··· 29 29 #include <drm/drm_modeset_helper_vtables.h> 30 30 #include <drm/drm_modeset_helper.h> 31 31 32 - /* 33 - * Drivers that don't allow primary plane scaling may pass this macro in place 34 - * of the min/max scale parameters of the update checker function. 35 - * 36 - * Due to src being in 16.16 fixed point and dest being in integer pixels, 37 - * 1<<16 represents no scaling. 38 - */ 39 - #define DRM_PLANE_HELPER_NO_SCALING (1<<16) 40 - 41 32 void drm_primary_helper_destroy(struct drm_plane *plane); 42 33 extern const struct drm_plane_funcs drm_primary_helper_funcs; 43 34