Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm/mdp: Use atomic helper to set crtc property

Assign drm_atomic_helper_crtc_set_property helper to MDP4 and MDP5
crtcs' set_property ops. This replaces the custom funcs that
returned an error even for standard crtc properties.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Rob Clark <robdclark@gmail.com>

authored by

Archit Taneja and committed by
Rob Clark
4103eef9 f31d12af

+2 -16
+1 -8
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
··· 361 361 request_pending(crtc, PENDING_FLIP); 362 362 } 363 363 364 - static int mdp4_crtc_set_property(struct drm_crtc *crtc, 365 - struct drm_property *property, uint64_t val) 366 - { 367 - // XXX 368 - return -EINVAL; 369 - } 370 - 371 364 #define CURSOR_WIDTH 64 372 365 #define CURSOR_HEIGHT 64 373 366 ··· 492 499 .set_config = drm_atomic_helper_set_config, 493 500 .destroy = mdp4_crtc_destroy, 494 501 .page_flip = drm_atomic_helper_page_flip, 495 - .set_property = mdp4_crtc_set_property, 502 + .set_property = drm_atomic_helper_crtc_set_property, 496 503 .cursor_set = mdp4_crtc_cursor_set, 497 504 .cursor_move = mdp4_crtc_cursor_move, 498 505 .reset = drm_atomic_helper_crtc_reset,
+1 -8
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
··· 468 468 request_pending(crtc, PENDING_FLIP); 469 469 } 470 470 471 - static int mdp5_crtc_set_property(struct drm_crtc *crtc, 472 - struct drm_property *property, uint64_t val) 473 - { 474 - // XXX 475 - return -EINVAL; 476 - } 477 - 478 471 static void get_roi(struct drm_crtc *crtc, uint32_t *roi_w, uint32_t *roi_h) 479 472 { 480 473 struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); ··· 618 625 .set_config = drm_atomic_helper_set_config, 619 626 .destroy = mdp5_crtc_destroy, 620 627 .page_flip = drm_atomic_helper_page_flip, 621 - .set_property = mdp5_crtc_set_property, 628 + .set_property = drm_atomic_helper_crtc_set_property, 622 629 .reset = drm_atomic_helper_crtc_reset, 623 630 .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, 624 631 .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,