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

Commit 5866bec2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.15-rc7' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Just collecting some fixes to finish my hoildays :-).

  A few fixes for i915 (one documentation build fix), one ttm fix, one
  AMD display fix, one omapdrm fix, and a set of armada fixes from
  Russell.

  All seem pretty small, you can now return to your latest security news
  site"

* tag 'drm-fixes-for-v4.15-rc7' of git://people.freedesktop.org/~airlied/linux:
  drm/i915: Apply Display WA #1183 on skl, kbl, and cfl
  drm/ttm: check the return value of kzalloc
  drm/amd/display: call set csc_default if enable adjustment is false
  docs: fix, intel_guc_loader.c has been moved to intel_guc_fw.c
  omapdrm/dss/hdmi4_cec: fix interrupt handling
  documentation/gpu/i915: fix docs build error after file rename
  drm/i915: Put all non-blocking modesets onto an ordered wq
  drm/i915: Disable DC states around GMBUS on GLK
  drm/i915/psr: Fix register name mess up.
  drm/armada: fix YUV planar format framebuffer offsets
  drm/armada: improve efficiency of armada_drm_plane_calc_addrs()
  drm/armada: fix UV swap code
  drm/armada: fix SRAM powerdown
  drm/armada: fix leak of crtc structure
parents e1915c81 bc6fe533

Documentation/gpu/i915.rst

+1 −4
Original line number Diff line number Diff line
@@ -341,10 +341,7 @@ GuC 
GuC-specific firmware loader

----------------------------



.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c

   :doc: GuC-specific firmware loader



.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_loader.c

.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c

   :internal:



GuC-based command submission

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h

+1 −1
Original line number Diff line number Diff line
@@ -1360,7 +1360,7 @@ void dpp1_cm_set_output_csc_adjustment( 


void dpp1_cm_set_output_csc_default(

		struct dpp *dpp_base,

		const struct default_adjustment *default_adjust);

		enum dc_color_space colorspace);



void dpp1_cm_set_gamut_remap(

	struct dpp *dpp,

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c

+2 −4
Original line number Diff line number Diff line
@@ -225,14 +225,13 @@ void dpp1_cm_set_gamut_remap( 


void dpp1_cm_set_output_csc_default(

		struct dpp *dpp_base,

		const struct default_adjustment *default_adjust)

		enum dc_color_space colorspace)

{



	struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base);

	uint32_t ocsc_mode = 0;



	if (default_adjust != NULL) {

		switch (default_adjust->out_color_space) {

	switch (colorspace) {

		case COLOR_SPACE_SRGB:

		case COLOR_SPACE_2020_RGB_FULLRANGE:

			ocsc_mode = 0;
@@ -254,7 +253,6 @@ void dpp1_cm_set_output_csc_default( 
		default:

			break;

	}

	}



	REG_SET(CM_OCSC_CONTROL, 0, CM_OCSC_MODE, ocsc_mode);

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c

+2 −0
Original line number Diff line number Diff line
@@ -2097,6 +2097,8 @@ static void program_csc_matrix(struct pipe_ctx *pipe_ctx, 
			tbl_entry.color_space = color_space;

			//tbl_entry.regval = matrix;

			pipe_ctx->plane_res.dpp->funcs->opp_set_csc_adjustment(pipe_ctx->plane_res.dpp, &tbl_entry);

	} else {

		pipe_ctx->plane_res.dpp->funcs->opp_set_csc_default(pipe_ctx->plane_res.dpp, colorspace);

	}

}

static bool is_lower_pipe_tree_visible(struct pipe_ctx *pipe_ctx)

drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ struct dpp_funcs { 


	void (*opp_set_csc_default)(

		struct dpp *dpp,

		const struct default_adjustment *default_adjust);

		enum dc_color_space colorspace);



	void (*opp_set_csc_adjustment)(

		struct dpp *dpp,