redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

core: Add 220us psr setup time (Dhinakaran) 

omap: Fix NULL deref (Tomi)
 
 Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
 Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCgAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAlsNe2EACgkQlvcN/ahK
 BwodvwgAicKl6BQCs2G3EkWQFjM2pYXLr27WxDgAH5nlUJZ1k0CPVBui3xfT8wb9
 CXgLVRXlkTdBpyEFHQJiq/wnzs9CsvFSaEVvkprwT9yPqPclp+02hMMo78bGinvQ
 Rknr03SIYHFORjP1S4C161tMu2Tz84u+KElogpAQloWGQkBdaXcQsIuzJUGZVFwo
 ahDnKV/SLRm1qChFSrvD0JcgkkjGz2nBcXUKgPtwf9FbWJ6ve9q3JN+gXXjEeE9Z
 pIDHt2BADhgJq2cLE8u4w9QvN1JpnuEXNn4rrGGtGVoHgwIrAUeRLGAvSHqbWP1T
 +X+xL8IneUv4TJxA5BpMvOgef1MlrA==
 =dDnt
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-fixes-2018-05-29' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

core: Add 220us psr setup time (Dhinakaran)
omap: Fix NULL deref (Tomi)

Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>

* tag 'drm-misc-fixes-2018-05-29' of git://anongit.freedesktop.org/drm/drm-misc:
  drm/omap: fix NULL deref crash with SDI displays
  drm/psr: Fix missed entry in PSR setup time table.
hifive-unleashed-5.1
Dave Airlie 2018-05-30 10:57:57 +10:00
parent 801dff41ba 2bc5ff0bdc
commit ebb442bb35
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/drm_dp_helper.c
View File

@ -1145,6 +1145,7 @@ int drm_dp_psr_setup_time(const u8 psr_cap[EDP_PSR_RECEIVER_CAP_SIZE])
static const u16 psr_setup_time_us[] = {
PSR_SETUP_TIME(330),
PSR_SETUP_TIME(275),
PSR_SETUP_TIME(220),
PSR_SETUP_TIME(165),
PSR_SETUP_TIME(110),
PSR_SETUP_TIME(55),

5
drivers/gpu/drm/omapdrm/dss/sdi.c
View File

@ -82,7 +82,7 @@ static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
struct dispc_clock_info *dispc_cinfo)
{
int i;
struct sdi_clk_calc_ctx ctx = { .sdi = sdi };
struct sdi_clk_calc_ctx ctx;
/*
* DSS fclk gives us very few possibilities, so finding a good pixel
@ -95,6 +95,9 @@ static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
bool ok;
memset(&ctx, 0, sizeof(ctx));
ctx.sdi = sdi;
if (pclk > 1000 * i * i * i)
ctx.pck_min = max(pclk - 1000 * i * i * i, 0lu);
else