14d0066b84
Daniel noted[1] that commit d606dc9a6323 ("drm: kirin: Add
register connect helper functions in drm init") was unnecessary
and incorrect, as drm_dev_register does register connectors for
us.
Thus, this patch reverts the change as suggested by Daniel.
[1]: https://lore.kernel.org/lkml/CAKMK7uHr5U-pPsxdQ4MpfK5v8iLjphDFug_3VTiUAf06nhS=yQ@mail.gmail.com/
Cc: Xu YiPing <xuyiping@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinliang Liu <xinliang.liu@linaro.org>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: dri-devel <dri-devel@lists.freedesktop.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Xinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200409004306.18541-1-john.stultz@linaro.org
58 lines
1.3 KiB
C
58 lines
1.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copyright (c) 2016 Linaro Limited.
|
|
* Copyright (c) 2014-2016 Hisilicon Limited.
|
|
*/
|
|
|
|
#ifndef __KIRIN_DRM_DRV_H__
|
|
#define __KIRIN_DRM_DRV_H__
|
|
|
|
#define to_kirin_crtc(crtc) \
|
|
container_of(crtc, struct kirin_crtc, base)
|
|
|
|
#define to_kirin_plane(plane) \
|
|
container_of(plane, struct kirin_plane, base)
|
|
|
|
/* kirin-format translate table */
|
|
struct kirin_format {
|
|
u32 pixel_format;
|
|
u32 hw_format;
|
|
};
|
|
|
|
struct kirin_crtc {
|
|
struct drm_crtc base;
|
|
void *hw_ctx;
|
|
bool enable;
|
|
};
|
|
|
|
struct kirin_plane {
|
|
struct drm_plane base;
|
|
void *hw_ctx;
|
|
u32 ch;
|
|
};
|
|
|
|
/* display controller init/cleanup ops */
|
|
struct kirin_drm_data {
|
|
const u32 *channel_formats;
|
|
u32 channel_formats_cnt;
|
|
int config_max_width;
|
|
int config_max_height;
|
|
u32 num_planes;
|
|
u32 prim_plane;
|
|
|
|
struct drm_driver *driver;
|
|
const struct drm_crtc_helper_funcs *crtc_helper_funcs;
|
|
const struct drm_crtc_funcs *crtc_funcs;
|
|
const struct drm_plane_helper_funcs *plane_helper_funcs;
|
|
const struct drm_plane_funcs *plane_funcs;
|
|
const struct drm_mode_config_funcs *mode_config_funcs;
|
|
|
|
void *(*alloc_hw_ctx)(struct platform_device *pdev,
|
|
struct drm_crtc *crtc);
|
|
void (*cleanup_hw_ctx)(void *hw_ctx);
|
|
};
|
|
|
|
extern struct kirin_drm_data ade_driver_data;
|
|
|
|
#endif /* __KIRIN_DRM_DRV_H__ */
|