shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: logo: copy mode from mode_set if no used crtc

Browse Source 
1. Add rockchip_drm_copy_mode_from_mode_set() to copy
drm_display_mode from rockchip_drm_mode_set, which
stores the display state information in uboot.
2. Call rockchip_drm_copy_mode_from_mode_set() if vp
failed to initialize.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I0dea7237353dfe7b0d56bee81a47970ebb538d50
This commit is contained in:
Damon Ding
2022-09-19 09:36:08 +08:00
committed by Tao Huang
parent 064f8026d1
commit 4ddfedbb27
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/gpu/drm/rockchip/rockchip_drm_logo.c
View File

@@ -869,6 +869,18 @@ static int update_state(struct drm_device *drm_dev,
return ret;
}
static void rockchip_drm_copy_mode_from_mode_set(struct drm_display_mode *mode,
struct rockchip_drm_mode_set *set)
{
mode->clock = set->clock;
mode->hdisplay = set->hdisplay;
mode->vdisplay = set->vdisplay;
mode->crtc_hsync_end = set->crtc_hsync_end;
mode->crtc_vsync_end = set->crtc_vsync_end;
mode->flags = set->flags & DRM_MODE_FLAG_ALL;
mode->picture_aspect_ratio = set->picture_aspect_ratio;
}
void rockchip_drm_show_logo(struct drm_device *drm_dev)
{
struct drm_atomic_state *state, *old_state;
@@ -942,11 +954,22 @@ void rockchip_drm_show_logo(struct drm_device *drm_dev)
if (!find_used_crtc) {
struct drm_crtc *crtc = unset->crtc;
struct drm_crtc_state *crtc_state;
int pipe = drm_crtc_index(crtc);
struct rockchip_drm_private *priv =
drm_dev->dev_private;
/*
* The display timing information of mode_set is parsed from dts, which
* written in uboot. If the mode_set is added into mode_unset_list, it
* should be converted to crtc_state->adjusted_mode, in order to check
* splice_mode flag in loader_protect().
*/
if (unset->hdisplay && unset->vdisplay) {
crtc_state = drm_atomic_get_crtc_state(state, crtc);
if (crtc_state)
rockchip_drm_copy_mode_from_mode_set(&crtc_state->adjusted_mode,
unset);
if (priv->crtc_funcs[pipe] &&
priv->crtc_funcs[pipe]->loader_protect)
priv->crtc_funcs[pipe]->loader_protect(crtc, true);