Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions drivers/gpu/drm/google/gs-decon.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,24 +210,26 @@ static const struct drm_display_mode gs_decon_modes[] = {
};

/*
* TG4B/TG4C 60 Hz timings from panel-gs-tg4b.c and panel-gs-tg4c.c.
* TG4A uses different porches; only the active size is consumed here.
* Keep the inherited 60 Hz configuration.
* TG4B/TG4C timings from panel-gs-tg4b.c and panel-gs-tg4c.c, at 60 Hz (the
* bootloader's) and 120 Hz. TG4A uses different porches; DECON only needs
* the active size and the totals.
*/
#define TEGU_DECON_MODE(hz) { \
.clock = (1080 + 32 + 12 + 16) * (2424 + 12 + 4 + 15) * (hz) / 1000, \
.hdisplay = 1080, \
.hsync_start = 1080 + 32, \
.hsync_end = 1080 + 32 + 12, \
.htotal = 1080 + 32 + 12 + 16, \
.vdisplay = 2424, \
.vsync_start = 2424 + 12, \
.vsync_end = 2424 + 12 + 4, \
.vtotal = 2424 + 12 + 4 + 15, \
.type = DRM_MODE_TYPE_DRIVER, \
}

static const struct drm_display_mode tegu_decon_modes[] = {
{
.clock = (1080 + 32 + 12 + 16) * (2424 + 12 + 4 + 15) * 60 / 1000,
.hdisplay = 1080,
.hsync_start = 1080 + 32,
.hsync_end = 1080 + 32 + 12,
.htotal = 1080 + 32 + 12 + 16,
.vdisplay = 2424,
.vsync_start = 2424 + 12,
.vsync_end = 2424 + 12 + 4,
.vtotal = 2424 + 12 + 4 + 15,
/* Physical size depends on the panel variant, not yet selected. */
.type = DRM_MODE_TYPE_DRIVER,
},
TEGU_DECON_MODE(60),
TEGU_DECON_MODE(120),
};

struct gs_decon_soc_data {
Expand All @@ -239,6 +241,8 @@ struct gs_decon_soc_data {
bool separate_source_height;
bool padded_pitch;
bool start_hw_trigger;
/* the bootloader leaves MIF and DISP above the 120 Hz floors */
bool floors_optional;
};

static const struct gs_decon_soc_data gs201_decon_data = {
Expand All @@ -258,6 +262,7 @@ static const struct gs_decon_soc_data zumapro_decon_data = {
.separate_source_height = true,
.padded_pitch = true,
.start_hw_trigger = true,
.floors_optional = true,
};

#define GS_DECON_BOOT_HZ 60
Expand Down Expand Up @@ -1332,7 +1337,7 @@ static int gs_decon_get_dsim(struct gs_decon *dc)
}
dc->hz = hz;

if (max_refresh >= 120 && dc->mif &&
if (max_refresh >= 120 && (dc->mif || dc->soc->floors_optional) &&
gs_dsim_can_set_refresh_rate(dc->dsim, 120))
dc->max_hz = 120;
else if (max_refresh >= 120)
Expand Down
56 changes: 42 additions & 14 deletions drivers/gpu/drm/google/gs-dsim-cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,29 @@ struct gs_dsim_rate {
u32 te_ctrl1;
};

static const struct gs_dsim_rate gs_dsim_rates[] = {
{ .hz = 60, .underrun = 0x1f09, .te_ctrl1 = 0x33eb3b26 },
{ .hz = 120, .underrun = 0x03ec, .te_ctrl1 = 0x19f51d93 },
/*
* One set per panel and link, found at probe from the timers the
* bootloader left (its 60 Hz). Within a set, 120 Hz has half the TE
* timeouts and the underrun of Google's dsim_calc_underrun(): the 60 Hz
* value less the frame time saved (1e9 / 101 * (1/60 - 1/120) ns, te_var
* 1) at the link's word clock, in units of 100 word clocks.
*/
static const struct gs_dsim_rate gs_dsim_rates[][2] = {
/* Pixel 7 Pro, S6E3HC4 */
{
{ .hz = 60, .underrun = 0x1f09, .te_ctrl1 = 0x33eb3b26 },
{ .hz = 120, .underrun = 0x03ec, .te_ctrl1 = 0x19f51d93 },
},
/*
* Pixel 9a, tg4c: word clock about 68.75 MHz (1100 Mbit/s lanes). The
* 60 Hz pair is the bootloader's; the 120 Hz underrun is derived from
* that value as above, which leaves less LP time than Google's own
* formula with tg4c's parameters would (0x69c), but ran clean.
*/
{
{ .hz = 60, .underrun = 0x18c8, .te_ctrl1 = 0x2a82306d },
{ .hz = 120, .underrun = 0x02a0, .te_ctrl1 = 0x15411836 },
},
};

struct gs_dsim {
Expand All @@ -100,6 +120,8 @@ struct gs_dsim {
struct drm_panel *panel;
/* the timers in use, NULL if they are not ones from gs_dsim_rates[] */
const struct gs_dsim_rate *rate;
/* the set the bootloader's timers matched */
const struct gs_dsim_rate *rates;
};

static struct platform_driver gs_dsim_driver;
Expand Down Expand Up @@ -272,13 +294,16 @@ static ssize_t gs_dsim_transfer(struct mipi_dsi_host *host,

/* Refresh rate switching, for gs-decon */

static const struct gs_dsim_rate *gs_dsim_find_rate(unsigned int hz)
static const struct gs_dsim_rate *gs_dsim_find_rate(struct gs_dsim *dsim,
unsigned int hz)
{
int i;

for (i = 0; i < ARRAY_SIZE(gs_dsim_rates); i++)
if (gs_dsim_rates[i].hz == hz)
return &gs_dsim_rates[i];
if (!dsim->rates)
return NULL;
for (i = 0; i < ARRAY_SIZE(gs_dsim_rates[0]); i++)
if (dsim->rates[i].hz == hz)
return &dsim->rates[i];

return NULL;
}
Expand Down Expand Up @@ -356,7 +381,7 @@ bool gs_dsim_can_set_refresh_rate(struct gs_dsim *dsim, unsigned int hz)
if (dsim->rate && dsim->rate->hz == hz)
return true;

return dsim->rate && gs_dsim_find_rate(hz) && READ_ONCE(allow_tx) &&
return dsim->rate && gs_dsim_find_rate(dsim, hz) && READ_ONCE(allow_tx) &&
dsim->panel && dsim->panel->funcs &&
dsim->panel->funcs->set_refresh_rate;
}
Expand All @@ -378,7 +403,7 @@ EXPORT_SYMBOL_GPL(gs_dsim_can_set_refresh_rate);
*/
int gs_dsim_set_refresh_rate(struct gs_dsim *dsim, unsigned int hz)
{
const struct gs_dsim_rate *old, *new = gs_dsim_find_rate(hz);
const struct gs_dsim_rate *old, *new = gs_dsim_find_rate(dsim, hz);
int ret;

guard(mutex)(&dsim->panel_lock);
Expand Down Expand Up @@ -462,7 +487,7 @@ EXPORT_SYMBOL_GPL(gs_dsim_panel_sleep);
*/
int gs_dsim_panel_wake(struct gs_dsim *dsim, bool enable)
{
const struct gs_dsim_rate *cold = gs_dsim_find_rate(60);
const struct gs_dsim_rate *cold = gs_dsim_find_rate(dsim, 60);

guard(mutex)(&dsim->panel_lock);
if (!dsim->panel)
Expand Down Expand Up @@ -498,7 +523,7 @@ static int gs_dsim_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct gs_dsim *dsim;
u32 underrun, te_ctrl1;
int ret, i;
int ret, i, j;

dsim = devm_kzalloc(dev, sizeof(*dsim), GFP_KERNEL);
if (!dsim)
Expand All @@ -524,9 +549,12 @@ static int gs_dsim_probe(struct platform_device *pdev)
underrun = readl(dsim->regs + DSIM_UNDERRUN_CTRL);
te_ctrl1 = readl(dsim->regs + DSIM_CMD_TE_CTRL1);
for (i = 0; i < ARRAY_SIZE(gs_dsim_rates); i++)
if (gs_dsim_rates[i].underrun == underrun &&
gs_dsim_rates[i].te_ctrl1 == te_ctrl1)
dsim->rate = &gs_dsim_rates[i];
for (j = 0; j < ARRAY_SIZE(gs_dsim_rates[0]); j++)
if (gs_dsim_rates[i][j].underrun == underrun &&
gs_dsim_rates[i][j].te_ctrl1 == te_ctrl1) {
dsim->rates = gs_dsim_rates[i];
dsim->rate = &gs_dsim_rates[i][j];
}
if (dsim->rate)
dev_info(dev, "link timers for %u Hz\n", dsim->rate->hz);
else
Expand Down