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

Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-core-next 

* 'nouveau/for-airlied' of ../drm-nouveau-next: (77 commits)
  drm/nouveau: set TASK_(UN)INTERRUPTIBLE before schedule_timeout()
  drm/nv50: fix some not-error error messages
  drm/nouveau: introduce gpio engine
  drm/nv50: correct wait condition for instmem flush
  drm/nouveau: Fix TV-out detection on unposted cards lacking a usable DCB table.
  drm/nouveau: Get rid of the remaining VGA CRTC locking.
  drm/nouveau: Move display init to a new nouveau_engine.
  drm/nouveau: Put back the old 2-messages I2C slave test.
  drm/nouveau: Reset AGP before running the init scripts.
  drm/nv30: Init the PFB+0x3xx memory timing regs.
  drm/nouveau: disable hotplug detect around DP link training
  drm/nv50: add function to control GPIO IRQ reporting
  drm/nouveau: add nv_mask register accessor
  drm/nouveau: fix build without CONFIG_ACPI
  drm/nouveau: Reset CRTC owner to 0 before BIOS init.
  drm/nouveau: No need to lock/unlock the VGA CRTC regs all the time.
  drm/nouveau: Remove useless CRTC_OWNER logging.
  drm/nouveau: Add some generic I2C gadget detection code.
  drm/i2c/ch7006: Don't assume that the specified config points to static memory.
  drm/nv04-nv3x: Implement init-compute-mem.
  ...

Conflicts:
	drivers/gpu/drm/nouveau/nouveau_bios.c
parents 78276271 05991110

drivers/gpu/drm/i2c/ch7006_drv.c

+20 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static void ch7006_encoder_set_config(struct drm_encoder *encoder, 
{

	struct ch7006_priv *priv = to_ch7006_priv(encoder);



	priv->params = params;

	priv->params = *(struct ch7006_encoder_params *)params;

}



static void ch7006_encoder_destroy(struct drm_encoder *encoder)
@@ -114,7 +114,7 @@ static void ch7006_encoder_mode_set(struct drm_encoder *encoder, 
{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_encoder_params *params = priv->params;

	struct ch7006_encoder_params *params = &priv->params;

	struct ch7006_state *state = &priv->state;

	uint8_t *regs = state->regs;

	struct ch7006_mode *mode = priv->mode;
@@ -428,6 +428,22 @@ static int ch7006_remove(struct i2c_client *client) 
	return 0;

}



static int ch7006_suspend(struct i2c_client *client, pm_message_t mesg)

{

	ch7006_dbg(client, "\n");



	return 0;

}



static int ch7006_resume(struct i2c_client *client)

{

	ch7006_dbg(client, "\n");



	ch7006_write(client, 0x3d, 0x0);



	return 0;

}



static int ch7006_encoder_init(struct i2c_client *client,

			       struct drm_device *dev,

			       struct drm_encoder_slave *encoder)
@@ -487,6 +503,8 @@ static struct drm_i2c_encoder_driver ch7006_driver = { 
	.i2c_driver = {

		.probe = ch7006_probe,

		.remove = ch7006_remove,

		.suspend = ch7006_suspend,

		.resume = ch7006_resume,



		.driver = {

			.name = "ch7006",

drivers/gpu/drm/i2c/ch7006_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct ch7006_state { 
};



struct ch7006_priv {

	struct ch7006_encoder_params *params;

	struct ch7006_encoder_params params;

	struct ch7006_mode *mode;



	struct ch7006_state state;

drivers/gpu/drm/nouveau/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \

             nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \

             nouveau_display.o nouveau_connector.o nouveau_fbcon.o \

             nouveau_dp.o nouveau_grctx.o \

             nouveau_dp.o \

             nv04_timer.o \

             nv04_mc.o nv40_mc.o nv50_mc.o \

             nv04_fb.o nv10_fb.o nv40_fb.o nv50_fb.o \

             nv04_fb.o nv10_fb.o nv30_fb.o nv40_fb.o nv50_fb.o \

             nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \

             nv04_graph.o nv10_graph.o nv20_graph.o \

             nv40_graph.o nv50_graph.o \
@@ -22,7 +22,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ 
             nv50_cursor.o nv50_display.o nv50_fbcon.o \

             nv04_dac.o nv04_dfp.o nv04_tv.o nv17_tv.o nv17_tv_modes.o \

             nv04_crtc.o nv04_display.o nv04_cursor.o nv04_fbcon.o \

             nv17_gpio.o nv50_gpio.o \

             nv10_gpio.o nv50_gpio.o \

	     nv50_calc.o



nouveau-$(CONFIG_DRM_NOUVEAU_DEBUG) += nouveau_debugfs.o

drivers/gpu/drm/nouveau/nouveau_acpi.c

+37 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/slab.h>

#include <acpi/acpi_drivers.h>

#include <acpi/acpi_bus.h>

#include <acpi/video.h>



#include "drmP.h"

#include "drm.h"
@@ -11,6 +12,7 @@ 
#include "nouveau_drv.h"

#include "nouveau_drm.h"

#include "nv50_display.h"

#include "nouveau_connector.h"



#include <linux/vga_switcheroo.h>
@@ -42,7 +44,7 @@ static const char nouveau_dsm_muid[] = { 
	0xB3, 0x4D, 0x7E, 0x5F, 0xEA, 0x12, 0x9F, 0xD4,

};



static int nouveau_dsm(acpi_handle handle, int func, int arg, int *result)

static int nouveau_dsm(acpi_handle handle, int func, int arg, uint32_t *result)

{

	struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL };

	struct acpi_object_list input;
@@ -259,3 +261,37 @@ int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) 
{

	return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);

}



int

nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)

{

	struct nouveau_connector *nv_connector = nouveau_connector(connector);

	struct acpi_device *acpidev;

	acpi_handle handle;

	int type, ret;

	void *edid;



	switch (connector->connector_type) {

	case DRM_MODE_CONNECTOR_LVDS:

	case DRM_MODE_CONNECTOR_eDP:

		type = ACPI_VIDEO_DISPLAY_LCD;

		break;

	default:

		return -EINVAL;

	}



	handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);

	if (!handle)

		return -ENODEV;



	ret = acpi_bus_get_device(handle, &acpidev);

	if (ret)

		return -ENODEV;



	ret = acpi_video_get_edid(acpidev, type, -1, &edid);

	if (ret < 0)

		return ret;



	nv_connector->edid = edid;

	return 0;

}

drivers/gpu/drm/nouveau/nouveau_bios.c

+493 −143

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE