Commit 34044cd2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-5.4' of git://github.com/skeggsb/linux into drm-next 



This is mostly just the stuff I missed last round.  Various cleanup
patches + fixes, improvements to display colour management, and some
code to avoid loading when power cables aren't properly attached.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7hqj9_VHq+YiGL8Z8XsU2vPbqbNPC=LeN1Rb0XxMQypQ@mail.gmail.com
parents ae453006 a1af2afb

drivers/gpu/drm/nouveau/dispnv04/arb.c

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
 * SOFTWARE.

 */



#include <drm/drmP.h>



#include "nouveau_drv.h"

#include "nouveau_reg.h"

#include "hw.h"

drivers/gpu/drm/nouveau/dispnv04/crtc.c

+3 −51
Original line number Diff line number Diff line
@@ -22,11 +22,10 @@ 
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

 * DEALINGS IN THE SOFTWARE.

 */

#include <linux/pm_runtime.h>



#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_plane_helper.h>

#include <drm/drm_vblank.h>



#include "nouveau_drv.h"

#include "nouveau_reg.h"
@@ -1031,53 +1030,6 @@ nv04_crtc_cursor_move(struct drm_crtc *crtc, int x, int y) 
	return 0;

}



static int

nouveau_crtc_set_config(struct drm_mode_set *set,

			struct drm_modeset_acquire_ctx *ctx)

{

	struct drm_device *dev;

	struct nouveau_drm *drm;

	int ret;

	struct drm_crtc *crtc;

	bool active = false;

	if (!set || !set->crtc)

		return -EINVAL;



	dev = set->crtc->dev;



	/* get a pm reference here */

	ret = pm_runtime_get_sync(dev->dev);

	if (ret < 0 && ret != -EACCES)

		return ret;



	ret = drm_crtc_helper_set_config(set, ctx);



	drm = nouveau_drm(dev);



	/* if we get here with no crtcs active then we can drop a reference */

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		if (crtc->enabled)

			active = true;

	}



	pm_runtime_mark_last_busy(dev->dev);

	/* if we have active crtcs and we don't have a power ref,

	   take the current one */

	if (active && !drm->have_disp_power_ref) {

		drm->have_disp_power_ref = true;

		return ret;

	}

	/* if we have no active crtcs, then drop the power ref

	   we got before */

	if (!active && drm->have_disp_power_ref) {

		pm_runtime_put_autosuspend(dev->dev);

		drm->have_disp_power_ref = false;

	}

	/* drop the power reference we got coming in here */

	pm_runtime_put_autosuspend(dev->dev);

	return ret;

}



struct nv04_page_flip_state {

	struct list_head head;

	struct drm_pending_vblank_event *event;
@@ -1293,7 +1245,7 @@ static const struct drm_crtc_funcs nv04_crtc_funcs = { 
	.cursor_set = nv04_crtc_cursor_set,

	.cursor_move = nv04_crtc_cursor_move,

	.gamma_set = nv_crtc_gamma_set,

	.set_config = nouveau_crtc_set_config,

	.set_config = drm_crtc_helper_set_config,

	.page_flip = nv04_crtc_page_flip,

	.destroy = nv_crtc_destroy,

};

drivers/gpu/drm/nouveau/dispnv04/cursor.c

+0 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: MIT

#include <drm/drmP.h>

#include <drm/drm_mode.h>

#include "nouveau_drv.h"

#include "nouveau_reg.h"

drivers/gpu/drm/nouveau/dispnv04/dac.c

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>



#include "nouveau_drv.h"

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+1 −1
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
 * DEALINGS IN THE SOFTWARE.

 */



#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_fourcc.h>



#include "nouveau_drv.h"

#include "nouveau_reg.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE