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: drv: add rockchip default mode when enable force output

Browse Source 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Iebc75e54f4bef12baac694fc54a45af33540c783
This commit is contained in:
Sandy Huang
2022-03-23 18:12:16 +08:00
committed by Tao Huang
parent a2db8f2420
commit ea3141aacf
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -460,6 +460,8 @@ of_parse_display_resource(struct drm_device *drm_dev, struct device_node *route)
else
set->hue = 50;
set->force_output = of_property_read_bool(route, "force-output");
if (!of_property_read_u32(route, "cubic_lut,offset", &val)) {
private->cubic_lut[crtc->index].enable = true;
private->cubic_lut[crtc->index].offset = val;
@@ -478,7 +480,8 @@ of_parse_display_resource(struct drm_device *drm_dev, struct device_node *route)
}
static int rockchip_drm_fill_connector_modes(struct drm_connector *connector,
uint32_t maxX, uint32_t maxY)
uint32_t maxX, uint32_t maxY,
bool force_output)
{
struct drm_device *dev = connector->dev;
struct drm_display_mode *mode;
@@ -496,6 +499,8 @@ static int rockchip_drm_fill_connector_modes(struct drm_connector *connector,
list_for_each_entry(mode, &connector->modes, head)
mode->status = MODE_STALE;
if (force_output)
connector->force = DRM_FORCE_ON;
if (connector->force) {
if (connector->force == DRM_FORCE_ON ||
connector->force == DRM_FORCE_ON_DIGITAL)
@@ -550,10 +555,13 @@ static int rockchip_drm_fill_connector_modes(struct drm_connector *connector,
goto prune;
}
count = (*connector_funcs->get_modes)(connector);
if (!force_output)
count = (*connector_funcs->get_modes)(connector);
if (count == 0 && connector->status == connector_status_connected)
count = drm_add_modes_noedid(connector, 1024, 768);
if (force_output)
count += rockchip_drm_add_modes_noedid(connector);
if (count == 0)
goto prune;
@@ -649,7 +657,7 @@ static int setup_initial_state(struct drm_device *drm_dev,
if (set->sub_dev->loader_protect)
set->sub_dev->loader_protect(conn_state->best_encoder, true);
num_modes = rockchip_drm_fill_connector_modes(connector, 4096, 4096);
num_modes = rockchip_drm_fill_connector_modes(connector, 4096, 4096, set->force_output);
if (!num_modes) {
dev_err(drm_dev->dev, "connector[%s] can't found any modes\n",
connector->name);
@@ -1000,6 +1008,8 @@ void rockchip_drm_show_logo(struct drm_device *drm_dev)
*/
list_for_each_entry_safe(set, tmp, &mode_set_list, head) {
if (set->force_output)
set->sub_dev->connector->force = DRM_FORCE_UNSPECIFIED;
list_del(&set->head);
kfree(set);
}

1
drivers/gpu/drm/rockchip/rockchip_drm_logo.h
View File

@@ -33,6 +33,7 @@ struct rockchip_drm_mode_set {
unsigned int hue;
bool mode_changed;
bool force_output;
int ratio;
};