Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb442bb authored by Dave Airlie's avatar Dave Airlie
Browse files

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.
parents 801dff41 2bc5ff0b

drivers/gpu/drm/drm_dp_helper.c

+1 −0
Original line number Diff line number Diff line
@@ -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),

drivers/gpu/drm/omapdrm/dss/sdi.c

+4 −1
Original line number Diff line number Diff line
@@ -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