Skip to content

Commit

Permalink
drm/msm/dpu: setup merge modes in merge_3d block
Browse files Browse the repository at this point in the history
Handle setting up merge mode in merge_3d hardware block.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
  • Loading branch information
Dmitry Baryshkov authored and Rob Clark committed Nov 4, 2020
1 parent c40e6c6 commit 9ffd0e8
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
21 changes: 21 additions & 0 deletions drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
#include "dpu_kms.h"
#include "dpu_trace.h"

#define MERGE_3D_MUX 0x000
#define MERGE_3D_MODE 0x004

static const struct dpu_merge_3d_cfg *_merge_3d_offset(enum dpu_merge_3d idx,
const struct dpu_mdss_cfg *m,
void __iomem *addr,
Expand All @@ -32,9 +35,27 @@ static const struct dpu_merge_3d_cfg *_merge_3d_offset(enum dpu_merge_3d idx,
return ERR_PTR(-EINVAL);
}

static void dpu_hw_merge_3d_setup_3d_mode(struct dpu_hw_merge_3d *merge_3d,
enum dpu_3d_blend_mode mode_3d)
{
struct dpu_hw_blk_reg_map *c;
u32 data;


c = &merge_3d->hw;
if (mode_3d == BLEND_3D_NONE) {
DPU_REG_WRITE(c, MERGE_3D_MODE, 0);
DPU_REG_WRITE(c, MERGE_3D_MUX, 0);
} else {
data = BIT(0) | ((mode_3d - 1) << 1);
DPU_REG_WRITE(c, MERGE_3D_MODE, data);
}
}

static void _setup_merge_3d_ops(struct dpu_hw_merge_3d *c,
unsigned long features)
{
c->ops.setup_3d_mode = dpu_hw_merge_3d_setup_3d_mode;
};

static struct dpu_hw_blk_ops dpu_hw_ops;
Expand Down
4 changes: 4 additions & 0 deletions drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@ struct dpu_hw_merge_3d;
*
* struct dpu_hw_merge_3d_ops : Interface to the merge_3d Hw driver functions
* Assumption is these functions will be called after clocks are enabled
* @setup_3d_mode : enable 3D merge
*/
struct dpu_hw_merge_3d_ops {
void (*setup_3d_mode)(struct dpu_hw_merge_3d *merge_3d,
enum dpu_3d_blend_mode mode_3d);

};

struct dpu_hw_merge_3d {
Expand Down

0 comments on commit 9ffd0e8

Please sign in to comment.