Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ddebug #2

Merged
merged 12 commits into from
Apr 11, 2024
Merged

ddebug #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26f77c1
experiment - what happens when i just use atomic nonblocking commit ?
Consti10 Apr 8, 2024
e8c66b9
back to drm_atomic_commit
Consti10 Apr 8, 2024
795b894
disable the drm patches
Consti10 Apr 8, 2024
4d8cee7
only disable the drm_atomic_nonblocking_commit thingy
Consti10 Apr 8, 2024
1c3d036
experiment - never wait for vblank, ehm
Consti10 Apr 8, 2024
37726df
disable one more (wait ?)
Consti10 Apr 8, 2024
608f555
argh fix comp
Consti10 Apr 8, 2024
3ec003f
always set state->legacy_cursor_update = true on drmModeSetPlane
Consti10 Apr 8, 2024
b550fc1
what if we don't call atomic commit from there ... ?
Consti10 Apr 8, 2024
999bcb7
try and minimize unneeded changes
Consti10 Apr 9, 2024
b8cafd7
experiment - add 2560x1440 resolution
Consti10 Apr 10, 2024
3943f7d
always use 594000 as dclk
Consti10 Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions drivers/gpu/drm/rockchip/rockchip_drm_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,11 @@ static const struct drm_display_mode rockchip_drm_default_modes[] = {
798, 858, 0, 480, 489, 495, 525, 0,
DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC),
.picture_aspect_ratio = HDMI_PICTURE_ASPECT_4_3, },
/* Consti10 Added - paste from 16 - 1920x1080@60Hz 16:9 */
{ DRM_MODE("2560x1440", DRM_MODE_TYPE_DRIVER, 148500, 2560, 2008,
2052, 2200, 0, 1440, 1084, 1089, 1125, 0,
DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC),
.picture_aspect_ratio = HDMI_PICTURE_ASPECT_16_9, },
};

int rockchip_drm_add_modes_noedid(struct drm_connector *connector)
Expand Down Expand Up @@ -416,6 +421,9 @@ u32 rockchip_drm_get_dclk_by_width(int width)
int i = 0;
u32 dclk_khz;

// Consti10
if(true)return 594000;

for (i = 0; i < ARRAY_SIZE(rockchip_drm_dclk); i++) {
if (width == rockchip_drm_dclk[i].width) {
dclk_khz = rockchip_drm_dclk[i].dclk_khz;
Expand Down
5 changes: 5 additions & 0 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5375,7 +5375,11 @@ rockchip_atomic_helper_update_plane(struct drm_plane *plane,
if (plane == crtc->cursor || vpstate->async_commit)
state->legacy_cursor_update = true;

// Consti10
state->legacy_cursor_update = true;
//ret = drm_atomic_nonblocking_commit(state);
ret = drm_atomic_commit(state);
ret=0;
fail:
drm_atomic_state_put(state);
return ret;
Expand Down Expand Up @@ -9726,6 +9730,7 @@ static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state
*/
vop2_wait_for_irq_handler(crtc);


/**
* move here is to make sure current fs call function is complete,
* so when layer_sel_update is true, we can skip current vblank correctly.
Expand Down
Loading