Commit 72d74a06 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-11-07-1' of... 

Merge tag 'drm-misc-fixes-2019-11-07-1' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-fixes

 - Some new documentation for GEM shmem madvise helpers
 - Fix for a state dereference in atomic self-refresh helpers
 - One compilation fix for c2p fbdev helpers

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191107082215.GA34850@gilmour.lan
parents a99d8080 105401b6

drivers/gpu/drm/drm_atomic_helper.c

+14 −1
Original line number Diff line number Diff line
@@ -1581,8 +1581,11 @@ static void commit_tail(struct drm_atomic_state *old_state) 
{

	struct drm_device *dev = old_state->dev;

	const struct drm_mode_config_helper_funcs *funcs;

	struct drm_crtc_state *new_crtc_state;

	struct drm_crtc *crtc;

	ktime_t start;

	s64 commit_time_ms;

	unsigned int i, new_self_refresh_mask = 0;



	funcs = dev->mode_config.helper_private;
@@ -1602,6 +1605,15 @@ static void commit_tail(struct drm_atomic_state *old_state) 


	drm_atomic_helper_wait_for_dependencies(old_state);



	/*

	 * We cannot safely access new_crtc_state after

	 * drm_atomic_helper_commit_hw_done() so figure out which crtc's have

	 * self-refresh active beforehand:

	 */

	for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i)

		if (new_crtc_state->self_refresh_active)

			new_self_refresh_mask |= BIT(i);



	if (funcs && funcs->atomic_commit_tail)

		funcs->atomic_commit_tail(old_state);

	else
@@ -1610,7 +1622,8 @@ static void commit_tail(struct drm_atomic_state *old_state) 
	commit_time_ms = ktime_ms_delta(ktime_get(), start);

	if (commit_time_ms > 0)

		drm_self_refresh_helper_update_avg_times(old_state,

						 (unsigned long)commit_time_ms);

						 (unsigned long)commit_time_ms,

						 new_self_refresh_mask);



	drm_atomic_helper_commit_cleanup_done(old_state);

drivers/gpu/drm/drm_self_refresh_helper.c

+11 −7
Original line number Diff line number Diff line
@@ -133,29 +133,33 @@ out_drop_locks: 
 * drm_self_refresh_helper_update_avg_times - Updates a crtc's SR time averages

 * @state: the state which has just been applied to hardware

 * @commit_time_ms: the amount of time in ms that this commit took to complete

 * @new_self_refresh_mask: bitmask of crtc's that have self_refresh_active in

 *    new state

 *

 * Called after &drm_mode_config_funcs.atomic_commit_tail, this function will

 * update the average entry/exit self refresh times on self refresh transitions.

 * These averages will be used when calculating how long to delay before

 * entering self refresh mode after activity.

 */

void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,

					      unsigned int commit_time_ms)

void

drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,

					 unsigned int commit_time_ms,

					 unsigned int new_self_refresh_mask)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state, *new_crtc_state;

	struct drm_crtc_state *old_crtc_state;

	int i;



	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state,

				      new_crtc_state, i) {

	for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) {

		bool new_self_refresh_active = new_self_refresh_mask & BIT(i);

		struct drm_self_refresh_data *sr_data = crtc->self_refresh_data;

		struct ewma_psr_time *time;



		if (old_crtc_state->self_refresh_active ==

		    new_crtc_state->self_refresh_active)

		    new_self_refresh_active)

			continue;



		if (new_crtc_state->self_refresh_active)

		if (new_self_refresh_active)

			time = &sr_data->entry_avg_ms;

		else

			time = &sr_data->exit_avg_ms;

drivers/video/fbdev/c2p_core.h

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static inline void _transp(u32 d[], unsigned int i1, unsigned int i2, 


extern void c2p_unsupported(void);



static inline u32 get_mask(unsigned int n)

static __always_inline u32 get_mask(unsigned int n)

{

	switch (n) {

	case 1:
@@ -57,7 +57,7 @@ static inline u32 get_mask(unsigned int n) 
     *  Transpose operations on 8 32-bit words

     */



static inline void transp8(u32 d[], unsigned int n, unsigned int m)

static __always_inline void transp8(u32 d[], unsigned int n, unsigned int m)

{

	u32 mask = get_mask(n);
@@ -99,7 +99,7 @@ static inline void transp8(u32 d[], unsigned int n, unsigned int m) 
     *  Transpose operations on 4 32-bit words

     */



static inline void transp4(u32 d[], unsigned int n, unsigned int m)

static __always_inline void transp4(u32 d[], unsigned int n, unsigned int m)

{

	u32 mask = get_mask(n);
@@ -126,7 +126,7 @@ static inline void transp4(u32 d[], unsigned int n, unsigned int m) 
     *  Transpose operations on 4 32-bit words (reverse order)

     */



static inline void transp4x(u32 d[], unsigned int n, unsigned int m)

static __always_inline void transp4x(u32 d[], unsigned int n, unsigned int m)

{

	u32 mask = get_mask(n);

include/drm/drm_gem_shmem_helper.h

+13 −0
Original line number Diff line number Diff line
@@ -44,7 +44,20 @@ struct drm_gem_shmem_object { 
	 */

	unsigned int pages_use_count;



	/**

	 * @madv: State for madvise

	 *

	 * 0 is active/inuse.

	 * A negative value is the object is purged.

	 * Positive values are driver specific and not used by the helpers.

	 */

	int madv;



	/**

	 * @madv_list: List entry for madvise tracking

	 *

	 * Typically used by drivers to track purgeable objects

	 */

	struct list_head madv_list;



	/**

include/drm/drm_self_refresh_helper.h

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ struct drm_crtc; 


void drm_self_refresh_helper_alter_state(struct drm_atomic_state *state);

void drm_self_refresh_helper_update_avg_times(struct drm_atomic_state *state,

					      unsigned int commit_time_ms);

					unsigned int commit_time_ms,

					unsigned int new_self_refresh_mask);



int drm_self_refresh_helper_init(struct drm_crtc *crtc);

void drm_self_refresh_helper_cleanup(struct drm_crtc *crtc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE