![Daniel Vetter](/assets/img/avatar_default.png)
Having the probe helper stuff (which pretty much everyone needs) in the drm_crtc_helper.h file (which atomic drivers should never need) is confusing. Split them out. To make sure I actually achieved the goal here I went through all drivers. And indeed, all atomic drivers are now free of drm_crtc_helper.h includes. v2: Make it compile. There was so much compile fail on arm drivers that I figured I'll better not include any of the acks on v1. v3: Massive rebase because i915 has lost a lot of drmP.h includes, but not all: Through drm_crtc_helper.h > drm_modeset_helper.h -> drmP.h there was still one, which this patch largely removes. Which means rolling out lots more includes all over. This will also conflict with ongoing drmP.h cleanup by others I expect. v3: Rebase on top of atomic bochs. v4: Review from Laurent for bridge/rcar/omap/shmob/core bits: - (re)move some of the added includes, use the better include files in other places (all suggested from Laurent adopted unchanged). - sort alphabetically v5: Actually try to sort them, and while at it, sort all the ones I touch. v6: Rebase onto i915 changes. v7: Rebase once more. Acked-by: Harry Wentland <harry.wentland@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by: Benjamin Gaignard <benjamin.gaignard@linaro.org> Acked-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Neil Armstrong <narmstrong@baylibre.com> Acked-by: Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com> Acked-by: CK Hu <ck.hu@mediatek.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: linux-arm-kernel@lists.infradead.org Cc: virtualization@lists.linux-foundation.org Cc: etnaviv@lists.freedesktop.org Cc: linux-samsung-soc@vger.kernel.org Cc: intel-gfx@lists.freedesktop.org Cc: linux-mediatek@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Cc: nouveau@lists.freedesktop.org Cc: spice-devel@lists.freedesktop.org Cc: amd-gfx@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-rockchip@lists.infradead.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-tegra@vger.kernel.org Cc: xen-devel@lists.xen.org Link: https://patchwork.freedesktop.org/patch/msgid/20190117210334.13234-1-daniel.vetter@ffwll.ch
81 lines
1.7 KiB
C
81 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2012 Russell King
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef ARMADA_CRTC_H
|
|
#define ARMADA_CRTC_H
|
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
struct armada_gem_object;
|
|
|
|
struct armada_regs {
|
|
uint32_t offset;
|
|
uint32_t mask;
|
|
uint32_t val;
|
|
};
|
|
|
|
#define armada_reg_queue_mod(_r, _i, _v, _m, _o) \
|
|
do { \
|
|
struct armada_regs *__reg = _r; \
|
|
__reg[_i].offset = _o; \
|
|
__reg[_i].mask = ~(_m); \
|
|
__reg[_i].val = _v; \
|
|
_i++; \
|
|
} while (0)
|
|
|
|
#define armada_reg_queue_set(_r, _i, _v, _o) \
|
|
armada_reg_queue_mod(_r, _i, _v, ~0, _o)
|
|
|
|
#define armada_reg_queue_end(_r, _i) \
|
|
armada_reg_queue_mod(_r, _i, 0, 0, ~0)
|
|
|
|
struct armada_crtc;
|
|
struct armada_variant;
|
|
|
|
struct armada_crtc {
|
|
struct drm_crtc crtc;
|
|
const struct armada_variant *variant;
|
|
unsigned num;
|
|
void __iomem *base;
|
|
struct clk *clk;
|
|
struct clk *extclk[2];
|
|
struct {
|
|
uint32_t spu_v_h_total;
|
|
uint32_t spu_v_porch;
|
|
uint32_t spu_adv_reg;
|
|
} v[2];
|
|
bool interlaced;
|
|
bool cursor_update;
|
|
|
|
struct armada_gem_object *cursor_obj;
|
|
int cursor_x;
|
|
int cursor_y;
|
|
uint32_t cursor_hw_pos;
|
|
uint32_t cursor_hw_sz;
|
|
uint32_t cursor_w;
|
|
uint32_t cursor_h;
|
|
|
|
uint32_t cfg_dumb_ctrl;
|
|
uint32_t spu_iopad_ctrl;
|
|
|
|
spinlock_t irq_lock;
|
|
uint32_t irq_ena;
|
|
|
|
bool update_pending;
|
|
struct drm_pending_vblank_event *event;
|
|
struct armada_regs atomic_regs[32];
|
|
struct armada_regs *regs;
|
|
unsigned int regs_idx;
|
|
};
|
|
#define drm_to_armada_crtc(c) container_of(c, struct armada_crtc, crtc)
|
|
|
|
void armada_drm_crtc_update_regs(struct armada_crtc *, struct armada_regs *);
|
|
|
|
extern struct platform_driver armada_lcd_platform_driver;
|
|
|
|
#endif
|