diff options
| author | Sean Paul <seanpaul@chromium.org> | 2018-10-24 14:26:04 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2018-10-24 14:26:04 -0400 |
| commit | 6542e9adc0da1e23d81ff9314265a029b961906d (patch) | |
| tree | 35ba360a7150d8b042a9fd75ab54ef83b34a2b95 /drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | |
| parent | 2b02a05bdc3a62d36e0d0b015351897109e25991 (diff) | |
| parent | f2bfc71aee75feff33ca659322b72ffeed5a243d (diff) | |
| download | talos-op-linux-6542e9adc0da1e23d81ff9314265a029b961906d.tar.gz talos-op-linux-6542e9adc0da1e23d81ff9314265a029b961906d.zip | |
Merge drm/drm-next into drm-misc-next
4.19 is out, Lyude asked for a backmerge, and it's been a while. All
very good reasons on their own :-)
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h')
| -rw-r--r-- | drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h index 1240f505ca53..321fc64ddd0e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h @@ -148,16 +148,6 @@ struct dpu_hw_scaler3_cfg { struct dpu_hw_scaler3_de_cfg de; }; -struct dpu_hw_scaler3_lut_cfg { - bool is_configured; - u32 *dir_lut; - size_t dir_len; - u32 *cir_lut; - size_t cir_len; - u32 *sep_lut; - size_t sep_len; -}; - /** * struct dpu_drm_pix_ext_v1 - version 1 of pixel ext structure * @num_ext_pxls_lr: Number of total horizontal pixels @@ -325,12 +315,6 @@ int dpu_reg_read(struct dpu_hw_blk_reg_map *c, u32 reg_off); #define DPU_REG_WRITE(c, off, val) dpu_reg_write(c, off, val, #off) #define DPU_REG_READ(c, off) dpu_reg_read(c, off) -#define MISR_FRAME_COUNT_MASK 0xFF -#define MISR_CTRL_ENABLE BIT(8) -#define MISR_CTRL_STATUS BIT(9) -#define MISR_CTRL_STATUS_CLEAR BIT(10) -#define INTF_MISR_CTRL_FREE_RUN_MASK BIT(31) - void *dpu_hw_util_get_dir(void); void dpu_hw_setup_scaler3(struct dpu_hw_blk_reg_map *c, |
