torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

drm/msm: Use the central UBWC config database

Browse Source 
As discussed a lot in the past, the UBWC config must be coherent across
a number of IP blocks (currently display and GPU, but it also may/will
concern camera/video as the drivers evolve).

So far, we've been trying to keep the values reasonable in each of the
two drivers separately, but it really make sense to do so centrally,
especially given certain fields (e.g. HBB) may need to be gathered
dynamically.

To reduce room for error, move to fetching the config from a central
source, so that the data programmed into the hardware is consistent
across all multimedia blocks that request it.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/660963/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
This commit is contained in:
Konrad Dybcio 2025-06-26 11:02:30 +02:00 committed by Rob Clark
parent 227d4ce0b0
commit 45a2974157
11 changed files with 74 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/msm/Kconfig
View File

@ -31,6 +31,7 @@ config DRM_MSM
select SHMEM select SHMEM
select TMPFS select TMPFS
select QCOM_SCM select QCOM_SCM
select QCOM_UBWC_CONFIG
select WANT_DEV_COREDUMP select WANT_DEV_COREDUMP
select SND_SOC_HDMI_CODEC if SND_SOC select SND_SOC_HDMI_CODEC if SND_SOC
select SYNC_FILE select SYNC_FILE

6
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c
View File

@ -10,11 +10,11 @@
#include "dpu_hw_sspp.h" #include "dpu_hw_sspp.h"
#include "dpu_kms.h" #include "dpu_kms.h"
#include "msm_mdss.h"
#include <drm/drm_file.h> #include <drm/drm_file.h>
#include <drm/drm_managed.h> #include <drm/drm_managed.h>
#include <linux/soc/qcom/ubwc.h>
#define DPU_FETCH_CONFIG_RESET_VALUE 0x00000087 #define DPU_FETCH_CONFIG_RESET_VALUE 0x00000087
/* SSPP registers */ /* SSPP registers */
@ -684,7 +684,7 @@ int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms,
struct dpu_hw_sspp *dpu_hw_sspp_init(struct drm_device *dev, struct dpu_hw_sspp *dpu_hw_sspp_init(struct drm_device *dev,
const struct dpu_sspp_cfg *cfg, const struct dpu_sspp_cfg *cfg,
void __iomem *addr, void __iomem *addr,
const struct msm_mdss_data *mdss_data, const struct qcom_ubwc_cfg_data *mdss_data,
const struct dpu_mdss_version *mdss_rev) const struct dpu_mdss_version *mdss_rev)
{ {
struct dpu_hw_sspp *hw_pipe; struct dpu_hw_sspp *hw_pipe;

4
drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h
View File

@ -308,7 +308,7 @@ struct dpu_hw_sspp_ops {
struct dpu_hw_sspp { struct dpu_hw_sspp {
struct dpu_hw_blk base; struct dpu_hw_blk base;
struct dpu_hw_blk_reg_map hw; struct dpu_hw_blk_reg_map hw;
const struct msm_mdss_data *ubwc; const struct qcom_ubwc_cfg_data *ubwc;
/* Pipe */ /* Pipe */
enum dpu_sspp idx; enum dpu_sspp idx;
@ -325,7 +325,7 @@ struct dpu_kms;
struct dpu_hw_sspp *dpu_hw_sspp_init(struct drm_device *dev, struct dpu_hw_sspp *dpu_hw_sspp_init(struct drm_device *dev,
const struct dpu_sspp_cfg *cfg, const struct dpu_sspp_cfg *cfg,
void __iomem *addr, void __iomem *addr,
const struct msm_mdss_data *mdss_data, const struct qcom_ubwc_cfg_data *mdss_data,
const struct dpu_mdss_version *mdss_rev); const struct dpu_mdss_version *mdss_rev);
int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms, int _dpu_hw_sspp_init_debugfs(struct dpu_hw_sspp *hw_pipe, struct dpu_kms *kms,

7
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
View File

@ -20,9 +20,10 @@
#include <drm/drm_vblank.h> #include <drm/drm_vblank.h>
#include <drm/drm_writeback.h> #include <drm/drm_writeback.h>
#include <linux/soc/qcom/ubwc.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "msm_mmu.h" #include "msm_mmu.h"
#include "msm_mdss.h"
#include "msm_gem.h" #include "msm_gem.h"
#include "disp/msm_disp_snapshot.h" #include "disp/msm_disp_snapshot.h"
@ -1189,10 +1190,10 @@ static int dpu_kms_hw_init(struct msm_kms *kms)
goto err_pm_put; goto err_pm_put;
} }
dpu_kms->mdss = msm_mdss_get_mdss_data(dpu_kms->pdev->dev.parent); dpu_kms->mdss = qcom_ubwc_config_get_data();
if (IS_ERR(dpu_kms->mdss)) { if (IS_ERR(dpu_kms->mdss)) {
rc = PTR_ERR(dpu_kms->mdss); rc = PTR_ERR(dpu_kms->mdss);
DPU_ERROR("failed to get MDSS data: %d\n", rc); DPU_ERROR("failed to get UBWC config data: %d\n", rc);
goto err_pm_put; goto err_pm_put;
} }

2
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h
View File

@ -60,7 +60,7 @@ struct dpu_kms {
struct msm_kms base; struct msm_kms base;
struct drm_device *dev; struct drm_device *dev;
const struct dpu_mdss_cfg *catalog; const struct dpu_mdss_cfg *catalog;
const struct msm_mdss_data *mdss; const struct qcom_ubwc_cfg_data *mdss;
/* io/register spaces: */ /* io/register spaces: */
void __iomem *mmio, *vbif[VBIF_MAX]; void __iomem *mmio, *vbif[VBIF_MAX];

3
drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
View File

@ -17,8 +17,9 @@
#include <drm/drm_framebuffer.h> #include <drm/drm_framebuffer.h>
#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_atomic_helper.h>
#include <linux/soc/qcom/ubwc.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "msm_mdss.h"
#include "dpu_kms.h" #include "dpu_kms.h"
#include "dpu_hw_sspp.h" #include "dpu_hw_sspp.h"
#include "dpu_hw_util.h" #include "dpu_hw_util.h"

2
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c
View File

@ -40,7 +40,7 @@ static inline bool reserved_by_other(uint32_t *res_map, int idx,
int dpu_rm_init(struct drm_device *dev, int dpu_rm_init(struct drm_device *dev,
struct dpu_rm *rm, struct dpu_rm *rm,
const struct dpu_mdss_cfg *cat, const struct dpu_mdss_cfg *cat,
const struct msm_mdss_data *mdss_data, const struct qcom_ubwc_cfg_data *mdss_data,
void __iomem *mmio) void __iomem *mmio)
{ {
int rc, i; int rc, i;

2
drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h
View File

@ -69,7 +69,7 @@ struct msm_display_topology {
int dpu_rm_init(struct drm_device *dev, int dpu_rm_init(struct drm_device *dev,
struct dpu_rm *rm, struct dpu_rm *rm,
const struct dpu_mdss_cfg *cat, const struct dpu_mdss_cfg *cat,
const struct msm_mdss_data *mdss_data, const struct qcom_ubwc_cfg_data *mdss_data,
void __iomem *mmio); void __iomem *mmio);
int dpu_rm_reserve(struct dpu_rm *rm, int dpu_rm_reserve(struct dpu_rm *rm,

338
drivers/gpu/drm/msm/msm_mdss.c
View File

@ -16,14 +16,17 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/reset.h> #include <linux/reset.h>
#include "msm_mdss.h" #include <linux/soc/qcom/ubwc.h>
#include "msm_kms.h" #include "msm_kms.h"
#include <generated/mdss.xml.h> #include <generated/mdss.xml.h>
#define MIN_IB_BW 400000000UL /* Min ib vote 400MB */ #define MIN_IB_BW 400000000UL /* Min ib vote 400MB */
#define DEFAULT_REG_BW 153600 /* Used in mdss fbdev driver */ struct msm_mdss_data {
u32 reg_bus_bw;
};
struct msm_mdss { struct msm_mdss {
struct device *dev; struct device *dev;
@ -36,7 +39,8 @@ struct msm_mdss {
unsigned long enabled_mask; unsigned long enabled_mask;
struct irq_domain *domain; struct irq_domain *domain;
} irq_controller; } irq_controller;
const struct msm_mdss_data *mdss_data; const struct qcom_ubwc_cfg_data *mdss_data;
u32 reg_bus_bw;
struct icc_path *mdp_path[2]; struct icc_path *mdp_path[2];
u32 num_mdp_paths; u32 num_mdp_paths;
struct icc_path *reg_bus_path; struct icc_path *reg_bus_path;
@ -165,7 +169,7 @@ static int _msm_mdss_irq_domain_add(struct msm_mdss *msm_mdss)
static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss) static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss)
{ {
const struct msm_mdss_data *data = msm_mdss->mdss_data; const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data;
u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) |
MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13);
@ -180,7 +184,7 @@ static void msm_mdss_setup_ubwc_dec_20(struct msm_mdss *msm_mdss)
static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss) static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss)
{ {
const struct msm_mdss_data *data = msm_mdss->mdss_data; const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data;
u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) | u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle & 0x1) |
MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13);
@ -198,7 +202,7 @@ static void msm_mdss_setup_ubwc_dec_30(struct msm_mdss *msm_mdss)
static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss) static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss)
{ {
const struct msm_mdss_data *data = msm_mdss->mdss_data; const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data;
u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) |
MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13); MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit - 13);
@ -224,7 +228,7 @@ static void msm_mdss_setup_ubwc_dec_40(struct msm_mdss *msm_mdss)
static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss *msm_mdss) static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss *msm_mdss)
{ {
const struct msm_mdss_data *data = msm_mdss->mdss_data; const struct qcom_ubwc_cfg_data *data = msm_mdss->mdss_data;
u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) | u32 value = MDSS_UBWC_STATIC_UBWC_SWIZZLE(data->ubwc_swizzle) |
MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit); MDSS_UBWC_STATIC_HIGHEST_BANK_BIT(data->highest_bank_bit);
@ -240,69 +244,6 @@ static void msm_mdss_setup_ubwc_dec_50(struct msm_mdss *msm_mdss)
writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE); writel_relaxed(1, msm_mdss->mmio + REG_MDSS_UBWC_PREDICTION_MODE);
} }
#define MDSS_HW_MAJ_MIN \
(MDSS_HW_VERSION_MAJOR__MASK | MDSS_HW_VERSION_MINOR__MASK)
#define MDSS_HW_MSM8996 0x1007
#define MDSS_HW_MSM8937 0x100e
#define MDSS_HW_MSM8953 0x1010
#define MDSS_HW_MSM8998 0x3000
#define MDSS_HW_SDM660 0x3002
#define MDSS_HW_SDM630 0x3003
/*
* MDP5 platforms use generic qcom,mdp5 compat string, so we have to generate this data
*/
static const struct msm_mdss_data *msm_mdss_generate_mdp5_mdss_data(struct msm_mdss *mdss)
{
struct msm_mdss_data *data;
u32 hw_rev;
data = devm_kzalloc(mdss->dev, sizeof(*data), GFP_KERNEL);
if (!data)
return NULL;
hw_rev = readl_relaxed(mdss->mmio + REG_MDSS_HW_VERSION);
hw_rev = FIELD_GET(MDSS_HW_MAJ_MIN, hw_rev);
if (hw_rev == MDSS_HW_MSM8996 ||
hw_rev == MDSS_HW_MSM8937 ||
hw_rev == MDSS_HW_MSM8953 ||
hw_rev == MDSS_HW_MSM8998 ||
hw_rev == MDSS_HW_SDM660 ||
hw_rev == MDSS_HW_SDM630) {
data->ubwc_dec_version = UBWC_1_0;
data->ubwc_enc_version = UBWC_1_0;
}
if (hw_rev == MDSS_HW_MSM8996 ||
hw_rev == MDSS_HW_MSM8998)
data->highest_bank_bit = 15;
else
data->highest_bank_bit = 14;
return data;
}
const struct msm_mdss_data *msm_mdss_get_mdss_data(struct device *dev)
{
struct msm_mdss *mdss;
if (!dev)
return ERR_PTR(-EINVAL);
mdss = dev_get_drvdata(dev);
/*
* We could not do it at the probe time, since hw revision register was
* not readable. Fill data structure now for the MDP5 platforms.
*/
if (!mdss->mdss_data && mdss->is_mdp5)
mdss->mdss_data = msm_mdss_generate_mdp5_mdss_data(mdss);
return mdss->mdss_data;
}
static int msm_mdss_enable(struct msm_mdss *msm_mdss) static int msm_mdss_enable(struct msm_mdss *msm_mdss)
{ {
int ret, i; int ret, i;
@ -315,12 +256,8 @@ static int msm_mdss_enable(struct msm_mdss *msm_mdss)
for (i = 0; i < msm_mdss->num_mdp_paths; i++) for (i = 0; i < msm_mdss->num_mdp_paths; i++)
icc_set_bw(msm_mdss->mdp_path[i], 0, Bps_to_icc(MIN_IB_BW)); icc_set_bw(msm_mdss->mdp_path[i], 0, Bps_to_icc(MIN_IB_BW));
if (msm_mdss->mdss_data && msm_mdss->mdss_data->reg_bus_bw) icc_set_bw(msm_mdss->reg_bus_path, 0,
icc_set_bw(msm_mdss->reg_bus_path, 0, msm_mdss->reg_bus_bw);
msm_mdss->mdss_data->reg_bus_bw);
else
icc_set_bw(msm_mdss->reg_bus_path, 0,
DEFAULT_REG_BW);
ret = clk_bulk_prepare_enable(msm_mdss->num_clocks, msm_mdss->clocks); ret = clk_bulk_prepare_enable(msm_mdss->num_clocks, msm_mdss->clocks);
if (ret) { if (ret) {
@ -459,6 +396,7 @@ static int mdp5_mdss_parse_clock(struct platform_device *pdev, struct clk_bulk_d
static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5) static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5)
{ {
const struct msm_mdss_data *mdss_data;
struct msm_mdss *msm_mdss; struct msm_mdss *msm_mdss;
int ret; int ret;
int irq; int irq;
@ -471,7 +409,15 @@ static struct msm_mdss *msm_mdss_init(struct platform_device *pdev, bool is_mdp5
if (!msm_mdss) if (!msm_mdss)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
msm_mdss->mdss_data = of_device_get_match_data(&pdev->dev); msm_mdss->mdss_data = qcom_ubwc_config_get_data();
if (IS_ERR(msm_mdss->mdss_data))
return ERR_CAST(msm_mdss->mdss_data);
mdss_data = of_device_get_match_data(&pdev->dev);
if (!mdss_data)
return ERR_PTR(-EINVAL);
msm_mdss->reg_bus_bw = mdss_data->reg_bus_bw;
msm_mdss->mmio = devm_platform_ioremap_resource_byname(pdev, is_mdp5 ? "mdss_phys" : "mdss"); msm_mdss->mmio = devm_platform_ioremap_resource_byname(pdev, is_mdp5 ? "mdss_phys" : "mdss");
if (IS_ERR(msm_mdss->mmio)) if (IS_ERR(msm_mdss->mmio))
@ -590,217 +536,49 @@ static void mdss_remove(struct platform_device *pdev)
msm_mdss_destroy(mdss); msm_mdss_destroy(mdss);
} }
static const struct msm_mdss_data msm8998_data = { static const struct msm_mdss_data data_57k = {
.ubwc_enc_version = UBWC_1_0,
.ubwc_dec_version = UBWC_1_0,
.highest_bank_bit = 15,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data qcm2290_data = {
/* no UBWC */
.highest_bank_bit = 15,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sa8775p_data = {
.ubwc_enc_version = UBWC_4_0,
.ubwc_dec_version = UBWC_4_0,
.ubwc_swizzle = 4,
.ubwc_bank_spread = true,
.highest_bank_bit = 13,
.macrotile_mode = true,
.reg_bus_bw = 74000,
};
static const struct msm_mdss_data sar2130p_data = {
.ubwc_enc_version = UBWC_3_0, /* 4.0.2 in hw */
.ubwc_dec_version = UBWC_4_3,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
.highest_bank_bit = 13,
.macrotile_mode = 1,
.reg_bus_bw = 74000,
};
static const struct msm_mdss_data sc7180_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sc7280_data = {
.ubwc_enc_version = UBWC_3_0,
.ubwc_dec_version = UBWC_4_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
.highest_bank_bit = 14,
.macrotile_mode = true,
.reg_bus_bw = 74000,
};
static const struct msm_mdss_data sc8180x_data = {
.ubwc_enc_version = UBWC_3_0,
.ubwc_dec_version = UBWC_3_0,
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sc8280xp_data = {
.ubwc_enc_version = UBWC_4_0,
.ubwc_dec_version = UBWC_4_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sdm670_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sdm845_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.highest_bank_bit = 15,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm6350_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm7150_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm8150_data = {
.ubwc_enc_version = UBWC_3_0,
.ubwc_dec_version = UBWC_3_0,
.highest_bank_bit = 15,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm6115_data = {
.ubwc_enc_version = UBWC_1_0,
.ubwc_dec_version = UBWC_2_0,
.ubwc_swizzle = 7,
.ubwc_bank_spread = true,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm6125_data = {
.ubwc_enc_version = UBWC_1_0,
.ubwc_dec_version = UBWC_3_0,
.ubwc_swizzle = 1,
.highest_bank_bit = 14,
};
static const struct msm_mdss_data sm6150_data = {
.ubwc_enc_version = UBWC_2_0,
.ubwc_dec_version = UBWC_2_0,
.highest_bank_bit = 14,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm8250_data = {
.ubwc_enc_version = UBWC_4_0,
.ubwc_dec_version = UBWC_4_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
/* TODO: highest_bank_bit = 2 for LP_DDR4 */
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 76800,
};
static const struct msm_mdss_data sm8350_data = {
.ubwc_enc_version = UBWC_4_0,
.ubwc_dec_version = UBWC_4_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
/* TODO: highest_bank_bit = 2 for LP_DDR4 */
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 74000,
};
static const struct msm_mdss_data sm8550_data = {
.ubwc_enc_version = UBWC_4_0,
.ubwc_dec_version = UBWC_4_3,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
/* TODO: highest_bank_bit = 2 for LP_DDR4 */
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 57000, .reg_bus_bw = 57000,
}; };
static const struct msm_mdss_data sm8750_data = { static const struct msm_mdss_data data_74k = {
.ubwc_enc_version = UBWC_5_0, .reg_bus_bw = 74000,
.ubwc_dec_version = UBWC_5_0,
.ubwc_swizzle = 6,
.ubwc_bank_spread = true,
/* TODO: highest_bank_bit = 2 for LP_DDR4 */
.highest_bank_bit = 16,
.macrotile_mode = true,
.reg_bus_bw = 57000,
}; };
static const struct msm_mdss_data x1e80100_data = { static const struct msm_mdss_data data_76k8 = {
.ubwc_enc_version = UBWC_4_0, .reg_bus_bw = 76800,
.ubwc_dec_version = UBWC_4_3, };
.ubwc_swizzle = 6,
.ubwc_bank_spread = true, static const struct msm_mdss_data data_153k6 = {
/* TODO: highest_bank_bit = 2 for LP_DDR4 */ .reg_bus_bw = 153600,
.highest_bank_bit = 16,
.macrotile_mode = true,
/* TODO: Add reg_bus_bw with real value */
}; };
static const struct of_device_id mdss_dt_match[] = { static const struct of_device_id mdss_dt_match[] = {
{ .compatible = "qcom,mdss" }, { .compatible = "qcom,mdss", .data = &data_153k6 },
{ .compatible = "qcom,msm8998-mdss", .data = &msm8998_data }, { .compatible = "qcom,msm8998-mdss", .data = &data_76k8 },
{ .compatible = "qcom,qcm2290-mdss", .data = &qcm2290_data }, { .compatible = "qcom,qcm2290-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sa8775p-mdss", .data = &sa8775p_data }, { .compatible = "qcom,sa8775p-mdss", .data = &data_74k },
{ .compatible = "qcom,sar2130p-mdss", .data = &sar2130p_data }, { .compatible = "qcom,sar2130p-mdss", .data = &data_74k },
{ .compatible = "qcom,sdm670-mdss", .data = &sdm670_data }, { .compatible = "qcom,sdm670-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sdm845-mdss", .data = &sdm845_data }, { .compatible = "qcom,sdm845-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sc7180-mdss", .data = &sc7180_data }, { .compatible = "qcom,sc7180-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sc7280-mdss", .data = &sc7280_data }, { .compatible = "qcom,sc7280-mdss", .data = &data_74k },
{ .compatible = "qcom,sc8180x-mdss", .data = &sc8180x_data }, { .compatible = "qcom,sc8180x-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sc8280xp-mdss", .data = &sc8280xp_data }, { .compatible = "qcom,sc8280xp-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm6115-mdss", .data = &sm6115_data }, { .compatible = "qcom,sm6115-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm6125-mdss", .data = &sm6125_data }, { .compatible = "qcom,sm6125-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm6150-mdss", .data = &sm6150_data }, { .compatible = "qcom,sm6150-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm6350-mdss", .data = &sm6350_data }, { .compatible = "qcom,sm6350-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm6375-mdss", .data = &sm6350_data }, { .compatible = "qcom,sm6375-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm7150-mdss", .data = &sm7150_data }, { .compatible = "qcom,sm7150-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm8150-mdss", .data = &sm8150_data }, { .compatible = "qcom,sm8150-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm8250-mdss", .data = &sm8250_data }, { .compatible = "qcom,sm8250-mdss", .data = &data_76k8 },
{ .compatible = "qcom,sm8350-mdss", .data = &sm8350_data }, { .compatible = "qcom,sm8350-mdss", .data = &data_74k },
{ .compatible = "qcom,sm8450-mdss", .data = &sm8350_data }, { .compatible = "qcom,sm8450-mdss", .data = &data_74k },
{ .compatible = "qcom,sm8550-mdss", .data = &sm8550_data }, { .compatible = "qcom,sm8550-mdss", .data = &data_57k },
{ .compatible = "qcom,sm8650-mdss", .data = &sm8550_data}, { .compatible = "qcom,sm8650-mdss", .data = &data_57k },
{ .compatible = "qcom,sm8750-mdss", .data = &sm8750_data}, { .compatible = "qcom,sm8750-mdss", .data = &data_57k },
{ .compatible = "qcom,x1e80100-mdss", .data = &x1e80100_data}, /* TODO: x1e8: Add reg_bus_bw with real value */
{ .compatible = "qcom,x1e80100-mdss", .data = &data_153k6 },
{} {}
}; };
MODULE_DEVICE_TABLE(of, mdss_dt_match); MODULE_DEVICE_TABLE(of, mdss_dt_match);

29
drivers/gpu/drm/msm/msm_mdss.h
View File

@ -1,29 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (c) 2018, The Linux Foundation
*/
#ifndef __MSM_MDSS_H__
#define __MSM_MDSS_H__
struct msm_mdss_data {
u32 ubwc_enc_version;
/* can be read from register 0x58 */
u32 ubwc_dec_version;
u32 ubwc_swizzle;
u32 highest_bank_bit;
bool ubwc_bank_spread;
bool macrotile_mode;
u32 reg_bus_bw;
};
#define UBWC_1_0 0x10000000
#define UBWC_2_0 0x20000000
#define UBWC_3_0 0x30000000
#define UBWC_4_0 0x40000000
#define UBWC_4_3 0x40030000
#define UBWC_5_0 0x50000000
const struct msm_mdss_data *msm_mdss_get_mdss_data(struct device *dev);
#endif /* __MSM_MDSS_H__ */

2
include/linux/soc/qcom/ubwc.h
View File

@ -53,7 +53,7 @@ struct qcom_ubwc_cfg_data {
#define UBWC_4_3 0x40030000 #define UBWC_4_3 0x40030000
#define UBWC_5_0 0x50000000 #define UBWC_5_0 0x50000000
#ifdef CONFIG_QCOM_UBWC_CONFIG #if IS_ENABLED(CONFIG_QCOM_UBWC_CONFIG)
const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void); const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void);
#else #else
static inline const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void) static inline const struct qcom_ubwc_cfg_data *qcom_ubwc_config_get_data(void)