Skip to content

Commit

Permalink
drm/komeda: Accept null writeback configurations for writeback
Browse files Browse the repository at this point in the history
User may send null writeback configurations for writeback connector like:
- Only bind the writeback connector to crtc.
- set a fb_id(0) to writeback_fb_id_property
All above configurations are meaningless for writeback, but since they are
still valid configurations, accept them.

Depends on:
- https://patchwork.freedesktop.org/series/60856/

Signed-off-by: James Qian Wang (Arm Technology China) <james.qian.wang@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
  • Loading branch information
james qian wang (Arm Technology China) authored and Liviu Dudau committed Jun 19, 2019
1 parent 420810c commit f461d65
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions drivers/gpu/drm/arm/display/komeda/komeda_wb_connector.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ komeda_wb_init_data_flow(struct komeda_layer *wb_layer,
struct komeda_crtc_state *kcrtc_st,
struct komeda_data_flow_cfg *dflow)
{
struct drm_framebuffer *fb = conn_st->writeback_job ?
conn_st->writeback_job->fb : NULL;

if (!fb)
return -EINVAL;
struct drm_framebuffer *fb = conn_st->writeback_job->fb;

memset(dflow, 0, sizeof(*dflow));

Expand All @@ -42,10 +38,15 @@ komeda_wb_encoder_atomic_check(struct drm_encoder *encoder,
struct drm_connector_state *conn_st)
{
struct komeda_crtc_state *kcrtc_st = to_kcrtc_st(crtc_st);
struct drm_writeback_job *writeback_job = conn_st->writeback_job;
struct komeda_layer *wb_layer;
struct komeda_data_flow_cfg dflow;
int err;

if (!writeback_job || !writeback_job->fb) {
return 0;
}

if (!crtc_st->active) {
DRM_DEBUG_ATOMIC("Cannot write the composition result out on a inactive CRTC.\n");
return -EINVAL;
Expand Down

0 comments on commit f461d65

Please sign in to comment.