lkml.org 
[lkml]   [2019]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 4/9] drm: rcar-du: Claim CMM support for Gen3 SoCs
    Date
    Add CMM to the list of supported features for Gen3 SoCs that provide it:
    - R8A7795
    - R8A7796
    - R8A77965
    - R8A7799x

    Leave R8A77970 out as V3M and V3H are the only Gen3 SoCs that do not
    support CMM.

    Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu>
    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
    ---
    drivers/gpu/drm/rcar-du/rcar_du_drv.c | 12 ++++++++----
    drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 +
    2 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
    index 6df37c2a9678..018480a8f35c 100644
    --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
    +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
    @@ -276,7 +276,8 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = {
    .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
    | RCAR_DU_FEATURE_VSP1_SOURCE
    | RCAR_DU_FEATURE_INTERLACED
    - | RCAR_DU_FEATURE_TVM_SYNC,
    + | RCAR_DU_FEATURE_TVM_SYNC
    + | RCAR_DU_FEATURE_CMM,
    .channels_mask = BIT(3) | BIT(2) | BIT(1) | BIT(0),
    .routes = {
    /*
    @@ -309,7 +310,8 @@ static const struct rcar_du_device_info rcar_du_r8a7796_info = {
    .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
    | RCAR_DU_FEATURE_VSP1_SOURCE
    | RCAR_DU_FEATURE_INTERLACED
    - | RCAR_DU_FEATURE_TVM_SYNC,
    + | RCAR_DU_FEATURE_TVM_SYNC
    + | RCAR_DU_FEATURE_CMM,
    .channels_mask = BIT(2) | BIT(1) | BIT(0),
    .routes = {
    /*
    @@ -338,7 +340,8 @@ static const struct rcar_du_device_info rcar_du_r8a77965_info = {
    .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
    | RCAR_DU_FEATURE_VSP1_SOURCE
    | RCAR_DU_FEATURE_INTERLACED
    - | RCAR_DU_FEATURE_TVM_SYNC,
    + | RCAR_DU_FEATURE_TVM_SYNC
    + | RCAR_DU_FEATURE_CMM,
    .channels_mask = BIT(3) | BIT(1) | BIT(0),
    .routes = {
    /*
    @@ -386,7 +389,8 @@ static const struct rcar_du_device_info rcar_du_r8a77970_info = {
    static const struct rcar_du_device_info rcar_du_r8a7799x_info = {
    .gen = 3,
    .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK
    - | RCAR_DU_FEATURE_VSP1_SOURCE,
    + | RCAR_DU_FEATURE_VSP1_SOURCE
    + | RCAR_DU_FEATURE_CMM,
    .channels_mask = BIT(1) | BIT(0),
    .routes = {
    /*
    diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
    index 1327cd0df90a..a00dccc447aa 100644
    --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
    +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
    @@ -28,6 +28,7 @@ struct rcar_du_encoder;
    #define RCAR_DU_FEATURE_VSP1_SOURCE BIT(1) /* Has inputs from VSP1 */
    #define RCAR_DU_FEATURE_INTERLACED BIT(2) /* HW supports interlaced */
    #define RCAR_DU_FEATURE_TVM_SYNC BIT(3) /* Has TV switch/sync modes */
    +#define RCAR_DU_FEATURE_CMM BIT(4) /* Has CMM */

    #define RCAR_DU_QUIRK_ALIGN_128B BIT(0) /* Align pitches to 128 bytes */

    --
    2.23.0
    \
     
     \ /
      Last update: 2019-09-06 15:54    [W:2.640 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site